diff --git a/.github/quarkus-ecosystem-test b/.github/quarkus-ecosystem-test
index d5286ab9f8..877973c04d 100755
--- a/.github/quarkus-ecosystem-test
+++ b/.github/quarkus-ecosystem-test
@@ -3,7 +3,7 @@ set -e
 
 # For annotation processors, the managed dependency version doesn't work, so by default, we use 6.2.13.Final
 # Override this for snapshot builds and use the latest version instead
-HIBERNATE_VERSION=6.4.0.Final
+HIBERNATE_VERSION=6.6.1.Final
 
 # Since the compile output is used rather than the shaded JAR when running a Quarkus test, we must first install the parser to the local maven repo
 mvn --settings .github/quarkus-ecosystem-maven-settings.xml clean install -pl core/parser -am -Dversion.quarkus-3=${QUARKUS_VERSION} -Dversion.hibernate-orm=${HIBERNATE_VERSION} -DskipTests
@@ -11,4 +11,4 @@ mvn --settings .github/quarkus-ecosystem-maven-settings.xml clean install -pl co
 rm -Rf core/parser/target
 # In the second execution we exclude the parser from the project list so that it uses the previously installed one, which shades ANTLR
 PROJECT_LIST=integration/quarkus-3/deployment,examples/quarkus-3/testsuite/base,examples/quarkus-3/testsuite/native/h2,!core/parser
-mvn --settings .github/quarkus-ecosystem-maven-settings.xml clean install -Dversion.quarkus-3=${QUARKUS_VERSION} -Dversion.hibernate-orm=${HIBERNATE_VERSION} -Dquarkus.native.container-build=true -Pnative -Ph2 -P"spring-data-2.7.x" -P"deltaspike-1.9" --projects $PROJECT_LIST -am
\ No newline at end of file
+mvn --settings .github/quarkus-ecosystem-maven-settings.xml clean install -Dversion.quarkus-3=${QUARKUS_VERSION} -Dversion.hibernate-orm=${HIBERNATE_VERSION} -Dquarkus.native.container-build=true -Pnative -Ph2 -P"spring-data-3.3.x" -P"deltaspike-2.0" --projects $PROJECT_LIST -am
\ No newline at end of file
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fed321712f..ba6752623c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,553 +21,59 @@ jobs:
       matrix:
         include:
 ################################################
-# hibernate-5.6
+# hibernate-6.6
 ################################################
           - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
             native: true
           - rdbms: mysql
-            provider: hibernate-5.6
-            jdk: 8
-            native: true
-          - rdbms: mysql8
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
             native: true
           - rdbms: postgresql
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
             native: true
           - rdbms: oracle
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
 #            native: true
           - rdbms: db2
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
 #            native: true
           - rdbms: mssql
-            provider: hibernate-5.6
-            jdk: 8
+            provider: hibernate-6.6
+            jdk: 17
             native: true
 ################################################
 # Test different spring-data and deltaspike versions
 ################################################
           - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.0.x
-            deltaspike: deltaspike-1.8
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.1.x
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.2.x
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.3.x
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.4.x
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.5.x
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 8
-            spring-data: spring-data-2.6.x
+            provider: hibernate-6.6
+            jdk: 17
+            spring-data: spring-data-3.3.x
 ################################################
-# A Hibernate 5.6 profile that also runs the entity-view-annotation-processor
+# A Hibernate 6.6 profile that also runs the entity-view-annotation-processor
 ################################################
           - rdbms: postgresql
             provider: hibernate-apt
-            jdk: 8
-
-################################################
-# datanucleus-5
-################################################
-          - rdbms: h2
-            provider: datanucleus-5
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: mysql
-            provider: datanucleus-5
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: postgresql
-            provider: datanucleus-5
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: datanucleus-5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: datanucleus-5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: datanucleus-5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
+            jdk: 17
 
 ################################################
 # eclipselink
 ################################################
           - rdbms: h2
             provider: eclipselink
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: eclipselink
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: eclipselink
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: eclipselink
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: eclipselink
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: eclipselink
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# openjpa
-################################################
-#          - rdbms: h2
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: openjpa
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.3
-################################################
-          - rdbms: h2
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: mysql
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: postgresql
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: oracle
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: db2
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-          - rdbms: mssql
-            provider: hibernate-5.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-
-################################################
-# datanucleus-5.1
-################################################
-#          - rdbms: h2
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: datanucleus-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.5
-################################################
-          - rdbms: h2
-            provider: hibernate-5.5
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-5.5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-5.5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-5.5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-5.5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-5.5
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.4
-################################################
-          - rdbms: h2
-            provider: hibernate-5.4
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-5.4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-5.4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-5.4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-5.4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-5.4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.2
-################################################
-          - rdbms: h2
-            provider: hibernate-5.2
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-5.2
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.1
-################################################
-          - rdbms: h2
-            provider: hibernate-5.1
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-5.1
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-5.0
-################################################
-          - rdbms: h2
-            provider: hibernate-5.0
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-5.0
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-4.3
-################################################
-          - rdbms: h2
-            provider: hibernate-4.3
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate-4.3
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# hibernate-4.2
-################################################
-          - rdbms: h2
-            provider: hibernate
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mysql8
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: hibernate
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-
-################################################
-# datanucleus-4
-################################################
-          - rdbms: h2
-            provider: datanucleus-4
-            jdk: 8
-            spring-data: spring-data-1.11.x
-            deltaspike: deltaspike-1.7
-#          - rdbms: mysql
-#            provider: datanucleus-4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: postgresql
-#            provider: datanucleus-4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: mssql
-#            provider: datanucleus-4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: db2
-#            provider: datanucleus-4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
-#          - rdbms: oracle
-#            provider: datanucleus-4
-#            jdk: 8
-#            spring-data: spring-data-1.11.x
-#            deltaspike: deltaspike-1.7
+            jdk: 17
 
 ################################################
 # hibernate-6.2
 ################################################
           - rdbms: h2
             provider: hibernate-6.2
-            jdk: 11
+            jdk: 17
             spring-data: spring-data-3.1.x
 
 ################################################
@@ -578,54 +84,30 @@ jobs:
             jdk: 17
             spring-data: spring-data-3.2.x
 ################################################
-# hibernate-6.5
-################################################
-          - rdbms: h2
-            provider: hibernate-6.5
-            jdk: 17
-            spring-data: spring-data-3.3.x
-################################################
-# hibernate-6.6
-################################################
-          - rdbms: h2
-            provider: hibernate-6.6
-            jdk: 17
-            spring-data: spring-data-3.3.x
-################################################
 # LTS JDKs
 ################################################
           - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 11
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 11
-            build-jdk: 11
-          - rdbms: h2
-            provider: hibernate-5.6
-            jdk: 17
-          - rdbms: h2
-            provider: hibernate-5.6
+            provider: hibernate-6.6
             jdk: 17
             build-jdk: 17
 ################################################
 # Latest GA JDK
 ################################################
           - rdbms: h2
-            provider: hibernate-5.6
+            provider: hibernate-6.6
             jdk: 21
           - rdbms: h2
-            provider: hibernate-5.6
+            provider: hibernate-6.6
             jdk: 21
             build-jdk: 21
 ################################################
 # Early access JDKs
 ################################################
 #          - rdbms: h2
-#            provider: hibernate-5.6
+#            provider: hibernate-6.6
 #            jdk: 22-ea
 #          - rdbms: h2
-#            provider: hibernate-5.6
+#            provider: hibernate-6.6
 #            jdk: 22-ea
 #            build-jdk: 22-ea
     steps:
@@ -636,24 +118,20 @@ jobs:
         run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
       - name: Reclaim Disk Space
         run: .github/ci-prerequisites.sh
-      - uses: DeLaGuardo/setup-graalvm@master
+      - uses: graalvm/setup-graalvm@v1
         if: ${{ matrix.native }}
         with:
-          graalvm-version: '20.1.0.java11'
-      - name: Set up Java 8
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: 8
-          targets: JDK8_HOME;JAVA_HOME
+          java-version: '17'
+          distribution: 'mandrel'
       - name: Set up Requested JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 && !endsWith(matrix.jdk, '-ea') && matrix.jdk != '21' }}
+        if: ${{ !endsWith(matrix.jdk, '-ea') && matrix.jdk != '21' }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
       - name: Set up EA JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 && (endsWith(matrix.jdk, '-ea') || matrix.jdk == '21') }}
+        if: ${{ endsWith(matrix.jdk, '-ea') || matrix.jdk == '21' }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
@@ -676,7 +154,6 @@ jobs:
 
       - name: Run build script
         env:
-          JDK8_HOME: ${{ env.JDK8_HOME }}
           RDBMS: ${{ matrix.rdbms }}
           JPAPROVIDER: ${{ matrix.provider }}
           JDK: ${{ matrix.jdk }}
@@ -691,7 +168,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: test-reports-${{ matrix.provider }}-${{ matrix.rdbms }}-jdk${{ matrix.jdk }}-build-jdk${{ matrix.build-jdk }}-${{ matrix.deltaspike }}-${{ matrix.spring-data }}
+          name: test-reports-${{ matrix.provider }}-${{ matrix.rdbms }}-jdk${{ matrix.jdk }}-build-jdk${{ matrix.build-jdk }}-${{ matrix.spring-data }}
           path: './**/*-reports/'
 
       - name: Omit produced artifacts from build cache
diff --git a/.github/workflows/latest.yaml b/.github/workflows/latest.yaml
index 87c5594048..b38cd04df8 100644
--- a/.github/workflows/latest.yaml
+++ b/.github/workflows/latest.yaml
@@ -34,13 +34,6 @@ jobs:
             component: hibernate-6.4
             jdk: 17
 
-################################################
-# hibernate-6.5
-################################################
-          - rdbms: h2
-            component: hibernate-6.5
-            jdk: 17
-
 ################################################
 # hibernate-6.6
 ################################################
@@ -55,20 +48,15 @@ jobs:
         run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
       - name: Reclaim Disk Space
         run: .github/ci-prerequisites.sh
-      - name: Set up Java 8
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: 8
-          targets: JDK8_HOME;JAVA_HOME
       - name: Set up Requested JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 && !endsWith(matrix.jdk, '-ea') }}
+        if: ${{ !endsWith(matrix.jdk, '-ea') }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
       - name: Set up EA JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 && endsWith(matrix.jdk, '-ea') }}
+        if: ${{ endsWith(matrix.jdk, '-ea') }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
@@ -91,7 +79,6 @@ jobs:
 
       - name: Run build script
         env:
-          JDK8_HOME: ${{ env.JDK8_HOME }}
           RDBMS: ${{ matrix.rdbms }}
           COMPONENT: ${{ matrix.component }}
           JDK: ${{ matrix.jdk }}
diff --git a/.github/workflows/publish-snapshot.yaml b/.github/workflows/publish-snapshot.yaml
index 5281cd8741..8cdf594823 100644
--- a/.github/workflows/publish-snapshot.yaml
+++ b/.github/workflows/publish-snapshot.yaml
@@ -15,11 +15,6 @@ jobs:
         # /etc/hosts file needs to be updated as a workaround for
         # https://github.com/actions/virtual-environments/issues/3185
         run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
-      - name: Set up Java 8
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: 8
-          targets: JDK8_HOME;JAVA_HOME
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/quarkus-snapshot.yaml b/.github/workflows/quarkus-snapshot.yaml
index 8ae2608654..7defe1517b 100644
--- a/.github/workflows/quarkus-snapshot.yaml
+++ b/.github/workflows/quarkus-snapshot.yaml
@@ -32,9 +32,10 @@ jobs:
         run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ env.JAVA_VERSION }}
+          distribution: 'temurin'
 
       - name: Checkout repo
         uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49620c73f9..468fc53ff2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Changes that happened in releases
 
-## 1.6.15-SNAPSHOT
+## 2.0.0-SNAPSHOT
 
 ### New features
 
@@ -10,7 +10,9 @@ None yet
 
 ### Bug fixes
 
-None yet
+* Fix missing cascading deletes for deletes that contain joins or CTEs
+* Fix some issues with PostgreSQL and Oracle multiset SQL rendering with Hibernate ORM 6+
+* Fix returning clause rendering for PostgreSQL with Hibernate ORM 6+
 
 ### Backwards-incompatible changes
 
diff --git a/README.md b/README.md
index 9fdd1c55dd..2d97f118d6 100644
--- a/README.md
+++ b/README.md
@@ -40,12 +40,12 @@ Here is a rough overview of new features that are introduced by Blaze-Persistenc
 
 * Use CTEs and recursive CTEs
 * Use modification CTEs aka DML in CTEs
-* Make use of the RETURNING clause from DML statements
-* Use the VALUES clause for reporting queries and soon make use of table generating functions
-* Create queries that use SET operations like UNION, EXCEPT and INTERSECT
+* Make use of the `RETURNING` clause from DML statements
+* Use the `VALUES` clause for reporting queries and soon make use of table generating functions
+* Create queries that use SET operations like `UNION`, `EXCEPT` and `INTERSECT`
 * Manage entity collections via DML statements to avoid reading them in memory
-* Define functions similar to Hibernates SQLFunction in a JPA provider agnostic way
-* Use many built-in functions like GROUP_CONCAT, date extraction, date arithmetic and many more
+* Define functions similar to Hibernates `SQLFunction` in a JPA provider agnostic way
+* Use many built-in functions like `GROUP_CONCAT`, date extraction, date arithmetic and many more
 * Easy pagination and simple API to make use of keyset pagination
 
 In addition to that, Blaze-Persistence also works around some JPA provider issues in a transparent way.
@@ -114,71 +114,47 @@ mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=
 Java EE archetype:
 
 ```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-java-ee-sample" "-DarchetypeVersion=1.6.14"
-```
-
-Core-only Jakarta archetype:
-
-```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-core-sample-jakarta" "-DarchetypeVersion=1.6.14"
-```
-
-Entity view Jakarta archetype:
-
-```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-entity-view-sample-jakarta" "-DarchetypeVersion=1.6.14"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-jakarta-ee-sample" "-DarchetypeVersion=1.6.14"
 ```
 
 ## Supported Java runtimes
 
-All projects are built for Java 7 except for the ones where dependencies already use Java 8 like e.g. Hibernate 5.2, Spring Data 2.0 etc.
-So you are going to need a JDK 8 for building the project. The latest Java version we test and support is Java 21.
-
-We also support building the project with JDK 9 and try to keep up with newer versions.
-If you want to run your application on a Java 9 JVM you need to handle the fact that JDK 9+ doesn't export the JAXB and JTA APIs anymore.
-In fact, JDK 11 removed the modules, so the command line flags to add modules to the classpath won't work.
-
-Since libraries like Hibernate and others require these APIs you need to make them available. The easiest way to get these APIs back on the classpath is to package them along with your application.
-This will also work when running on Java 8. We suggest you add the following dependencies.
+All projects are built for Java 11 except for the ones where dependencies already use Java 17 like e.g. Spring Data integration etc.
+So you are going to need a JDK 17 for building the project. The latest Java version we test and support is Java 21.
 
 ```xml
 <dependency>
     <groupId>jakarta.xml.bind</groupId>
     <artifactId>jakarta.xml.bind-api</artifactId>
-    <!-- Use version 3.0.1 if you want to use Jakarta EE 9 -->
-    <version>2.3.3</version>
+    <version>3.0.1</version>
     <!-- In a managed environment like Java/Jakarta EE, use 'provided'. Otherwise use 'compile' -->
     <scope>provided</scope>
 </dependency>
 <dependency>
     <groupId>com.sun.xml.bind</groupId>
     <artifactId>jaxb-impl</artifactId>
-    <!-- Use version 3.0.2 if you want to use Jakarta EE 9 -->
-    <version>2.3.3</version>
+    <version>3.0.2</version>
     <!-- In a managed environment like Java/Jakarta EE, use 'provided'. Otherwise use 'compile' -->
     <scope>provided</scope>
 </dependency>
 <dependency>
     <groupId>jakarta.transaction</groupId>
     <artifactId>jakarta.transaction-api</artifactId>
-    <!-- Use version 2.0.0 if you want to use Jakarta EE 9 -->
-    <version>1.3.3</version>
+    <version>2.0.1</version>
     <!-- In a managed environment like Java/Jakarta EE, use 'provided'. Otherwise use 'compile' -->
     <scope>provided</scope>
 </dependency>
 <dependency>
     <groupId>jakarta.activation</groupId>
     <artifactId>jakarta.activation-api</artifactId>
-    <!-- Use version 2.0.1 if you want to use Jakarta EE 9 -->
-    <version>1.2.2</version>
+    <version>2.0.1</version>
     <!-- In a managed environment like Java/Jakarta EE, use 'provided'. Otherwise use 'compile' -->
     <scope>provided</scope>
 </dependency>
 <dependency>
     <groupId>jakarta.annotation</groupId>
     <artifactId>jakarta.annotation-api</artifactId>
-    <!-- Use version 2.0.0 if you want to use Jakarta EE 9 -->
-    <version>1.3.5</version>
+    <version>2.1.1</version>
     <!-- In a managed environment like Java/Jakarta EE, use 'provided'. Otherwise use 'compile' -->
     <scope>provided</scope>
 </dependency>
@@ -188,28 +164,25 @@ The `jakarta.transaction` and `jakarta.activation` dependencies are especially r
 
 ## Supported environments/libraries
 
-The bare minimum is JPA 2.0. If you want to use the JPA Criteria API module, you will also have to add the JPA 2 compatibility module.
-Generally, we support the usage in Java EE 6+ or Spring 4+ applications.
+The bare minimum is JPA 3.1. Generally, we support the usage in Java EE 10+, Quarkus 3+ or Spring 6+ applications.
 
 See the following table for an overview of supported versions.
 
-Module                           | Minimum version                     | Supported versions
----------------------------------|-------------------------------------|--------------------
-Hibernate integration            | Hibernate 4.2                       | 4.2, 4.3, 5.0+, 6.2+ (not all features are available in older versions)
-EclipseLink integration          | EclipseLink 2.6                     | 2.6 (Probably 2.4 and 2.5 work as well, but only tested against 2.6)
-DataNucleus integration          | DataNucleus 4.1                     | 4.1, 5.0
-OpenJPA integration              | N/A                                 | (Currently not usable. OpenJPA doesn't seem to be actively developed anymore and no users asked for support yet)
-Entity View CDI integration      | CDI 1.0                             | 1.0, 1.1, 1.2, 2.0, 3.0
-Entity View Spring integration   | Spring 4.3                          | 4.3, 5.0, 5.1, 5.2, 5.3, 6.0
-DeltaSpike Data integration      | DeltaSpike 1.7                      | 1.7, 1.8, 1.9
-Spring Data integration          | Spring Data 1.11                    | 1.11 - 2.7, 3.1 - 3.3
-Spring Data WebMvc integration   | Spring Data 1.11, Spring WebMvc 4.3 | Spring Data 1.11 - 2.7, Spring WebMvc 4.3 - 5.3
-Spring Data WebFlux integration  | Spring Data 2.0, Spring WebFlux 5.0 | Spring Data 2.0 - 2.7, Spring WebFlux 5.0 - 5.3
-Spring HATEOAS WebMvc integration| Spring Data 2.2, Spring WebMvc 5.2  | Spring Data 2.3+, Spring WebMvc 5.2+, Spring HATEOAS 1.0+
-Jackson integration              | 2.8.11                              | 2.8.11+
-GraphQL integration              | 17.3                                | 17.3+
-JAX-RS integration               | Any JAX-RS version                  | Any JAX-RS version
-Quarkus integration              | 1.4.2                               | 1.4+, 2.0+, 3.1+
+Module                           | Minimum version    | Supported versions
+---------------------------------|--------------------|--------------------
+Hibernate integration            | Hibernate 6.2      | 6.2, 6.4, 6.6
+EclipseLink integration          | EclipseLink 4.0    | 4.0
+Entity View CDI integration      | CDI 4.0            | 4.0+
+Entity View Spring integration   | Spring 6.0         | 6.0, 6.1
+DeltaSpike Data integration      | DeltaSpike 2.0     | 2.0
+Spring Data integration          | Spring Data 3.1    | 3.1, 3.2, 3.3
+Spring Data WebMvc integration   | Spring WebMvc 6.0  | 6.0, 6.1
+Spring Data WebFlux integration  | Spring WebFlux 6.0 | 6.0, 6.1
+Spring HATEOAS WebMvc integration| Spring HATEOAS 2.1 | Spring WebMvc 6.0+, Spring HATEOAS 2.1+
+Jackson integration              | 2.8.11             | 2.8.11+
+GraphQL integration              | 17.3               | 17.3+
+JAX-RS integration               | JAX-RS 3.1         | 3.1+
+Quarkus integration              | 3.2                | 3.2, 3.8, 3.15+
 
 ## Manual setup
 
@@ -438,12 +411,7 @@ Here some notes about setting up a local environment for testing.
 
 ## Setup general build environment
 
-Although Blaze-Persistence still supports running on Java 7, the build must be run with at least JDK 8.
-When doing a release at least a JDK 9 is required as we need to build some Multi-Release or MR JARs.
-Since we try to support the latest JDK versions as well, we require developers that want to build the project with JDK 11+ to define a system property for a release build.
-
-The system property `jdk8.home` should be set to the path to a Java 7 or 8 installation that contains either `jre/lib/rt.jar` or `jre/lib/classes.jar`.
-This property is necessary when using JDK 11+ because `sun.misc.Unsafe.defineClass` was removed.
+Although Blaze-Persistence still supports running on Java 11, the build must be run with at least JDK 17.
 
 ## Building the website and documentation
 
@@ -464,53 +432,27 @@ Click on *Check project* and checkstyle will run once for the whole project, the
 
 ## Testing a JPA provider and DBMS combination
 
-By default, a Maven build `mvn clean install` will test against H2 and Hibernate 5.2 but you can activate different profiles to test other combinations.
+By default, a Maven build `mvn clean install` will test against H2, Hibernate 6.6 and Spring Boot/Data 3.3, but you can activate different profiles to test other combinations.
 To test a specific combination, you need to activate at least 4 profiles
 
 * One of the JPA provider profiles
-  * `hibernate-6.6` + the `jakarta` profile
-  * `hibernate-6.5` + the `jakarta` profile
-  * `hibernate-6.4` + the `jakarta` profile
-  * `hibernate-6.3` + the `jakarta` profile
-  * `hibernate-6.2` + the `jakarta` profile
-  * `hibernate-5.6`
-  * `hibernate-5.5`
-  * `hibernate-5.4`
-  * `hibernate-5.3`
-  * `hibernate-5.2`
-  * `hibernate-5.1`
-  * `hibernate-5.0`
-  * `hibernate-4.3`
-  * `hibernate`
+  * `hibernate-6.6`
+  * `hibernate-6.4`
+  * `hibernate-6.2`
   * `eclipselink`
-  * `datanucleus-5.1`
-  * `datanucleus-5`
-  * `datanucleus-4`
-  * `openjpa`
 * A DBMS profile
   * `h2`
   * `postgresql`
   * `mysql`
-  * `mysql8`
   * `oracle`
   * `db2`
   * `mssql`
-  * `firebird`
-  * `sqllite`
 * A Spring data profile
-  * `spring-data-2.7.x`
-  * `spring-data-2.6.x`
-  * `spring-data-2.5.x`
-  * `spring-data-2.4.x`
-  * `spring-data-2.3.x`
-  * `spring-data-2.2.x`
-  * `spring-data-2.1.x`
-  * `spring-data-2.0.x`
-  * `spring-data-1.11.x`
+  * `spring-data-3.3.x`
+  * `spring-data-3.2.x`
+  * `spring-data-3.1.x`
 * A DeltaSpike profile
-  * `deltaspike-1.9`
-  * `deltaspike-1.8`
-  * `deltaspike-1.7`
+  * `deltaspike-2.0`
 
 The default DBMS connection infos are defined via Maven properties, so you can override them in a build by passing the properties as system properties.
 
@@ -523,11 +465,6 @@ The values are defined in e.g. `core/testsuite/pom.xml` in the respective DBMS p
 
 For executing tests against a database on a dedicated host you might want to specify the following system property `-DdbHost=192.168.99.100`.
 
-## Testing with Jakarta Persistence provider
-
-To build everything use `mvn -pl core/testsuite-jakarta-runner clean install -am -P "hibernate-6.2,jakarta,h2,spring-data-2.6.x,deltaspike-1.9" -DskipTests`
-and to run tests use ` mvn -pl core/testsuite-jakarta-runner clean install -P "hibernate-6.2,jakarta,h2,spring-data-2.6.x,deltaspike-1.9" "-Dtest=com.blazebit.persistence.testsuite.SetOperationTest#testUnionAllOrderBySubqueryLimit"`.
-
 ## Switching JPA provider profiles in IntelliJ
 
 When switching between Hibernate and other JPA provider profiles, IntelliJ does not unmark the `basic` or `hibernate` source directories in *core/testsuite*.
@@ -538,31 +475,6 @@ If you encounter errors like _duplicate class file found_ or something alike, ma
 
 Unmarking as source root can be done by right clicking on the source directory, going to the submenu _Mark directory as_ and finally clicking _Unmark as Sources Root_.
 
-## Using DataNucleus profiles in IntelliJ
-
-DataNucleus requires bytecode enhancement to work properly which requires an extra step to be able to do testing within IntelliJ.
-Usually when switching the JPA provider profile, it is recommended to trigger a _Rebuild Project_ action in IntelliJ to avoid strange errors causes by previous bytecode enhancement runs.
-After that, the entities in the project *core/testsuite* have to be enhanced. This is done through a Maven command.
-
-* DataNucleus 4: `mvn -P "datanucleus-4,h2,deltaspike-1.8,spring-data-2.0.x" -pl core/testsuite,entity-view/testsuite,integration/spring-data/testsuite/webmvc,integration/spring-data/testsuite/webflux datanucleus:enhance`
-* DataNucleus 5: `mvn -P "datanucleus-5,h2,deltaspike-1.8,spring-data-2.0.x" -pl core/testsuite,entity-view/testsuite,integration/spring-data/testsuite/webmvc,integration/spring-data/testsuite/webflux datanucleus:enhance`
-* DataNucleus 5.1: `mvn -P "datanucleus-5.1,h2,deltaspike-1.8,spring-data-2.0.x" -pl core/testsuite,entity-view/testsuite,integration/spring-data/testsuite/webmvc,integration/spring-data/testsuite/webflux datanucleus:enhance`
-
-After doing that, you should be able to execute any test in IntelliJ.
-
-Note that if you make changes to an entity class or add a new entity class you might need to redo the rebuild and enhancement. 
-
-## Firebird
-
-When installing the 3.x version, you also need a 3.x JDBC driver.
-Additionally you should add the following to the firebird.conf
-
-```
-WireCrypt = Enabled
-```
-
-After creating the DB with `create database 'localhost:test' user 'sysdba' password 'sysdba';`, you can connect with JDBC with `jdbc:firebirdsql:localhost:test?charSet=utf-8`
-
 ## Oracle
 
 When setting up Oracle locally, keep in mind that when you connect to it, you have to set the NLS_SORT to BINARY.
@@ -573,14 +485,14 @@ In IntelliJ when defining the Oracle database, go to the Advanced tab an specify
 
 The general setup required for building native images with GraalVM is described in https://quarkus.io/guides/building-native-image.
 
-* Install GraalVM 20.2.0 (Java 11) and make sure you install the native-image tool and set `GRAALVM_HOME` environment variable
+* Install GraalVM 22.3.0 (Java 17) and make sure you install the native-image tool and set `GRAALVM_HOME` environment variable
 * Install required packages for a C development environment
   *  Under Windows, install [Visual Studio 2017 Visual C++ Build Tools](https://aka.ms/vs/15/release/vs_buildtools.exe)
 
 For example, run the following maven build to execute native image tests for H2:
 
 ```
-mvn -pl examples/quarkus/testsuite/native/h2 -am integration-test -Pnative,h2,spring-data-2.7.x,deltaspike-1.9
+mvn -pl examples/quarkus/testsuite/native/h2 -am integration-test -Pnative,h2,spring-data-3.3.x,deltaspike-2.0
 ```
 
 Under Windows, make sure you run maven builds that use native image from the VS2017 native tools command line.
diff --git a/archetype/core-sample-jakarta/pom.xml b/archetype/core-sample-jakarta/pom.xml
deleted file mode 100644
index cfce385d05..0000000000
--- a/archetype/core-sample-jakarta/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-archetype-core-sample-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Archetype Core Sample Jakarta</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.archetype.core.sample</module.name>
-    </properties>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <configuration>
-                        <escapeString>\</escapeString>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>archetype-resources/pom.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>archetype-resources/pom.xml</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-</project>
diff --git a/archetype/core-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml b/archetype/core-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 91cfe17f0c..0000000000
--- a/archetype/core-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-    <id>blaze-persistence-core-sample</id>
-    <sources>
-        <source>src/main/java/model/Cat.java</source>
-        <source>src/main/java/model/Person.java</source>
-    </sources>
-    <resources>
-        <resource>src/main/resources/META-INF/persistence.xml</resource>
-    </resources>
-    <testSources>
-        <source>src/test/java/sample/AbstractSampleTest.java</source>
-        <source>src/test/java/sample/SampleTest.java</source>
-    </testSources>
-</archetype>
\ No newline at end of file
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/pom.xml b/archetype/core-sample-jakarta/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 988e815f31..0000000000
--- a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>\${groupId}</groupId>
-    <artifactId>\${artifactId}</artifactId>
-    <version>\${version}</version>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Core Sample</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        
-        <version.blaze-persistence>${project.version}</version.blaze-persistence>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-bom</artifactId>
-                <version>\${version.blaze-persistence}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>6.2.0.CR4</version>
-        </dependency>
-
-        <!-- Core dependencies -->
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>3.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>2.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>2.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.200</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 687a9b9fb0..0000000000
--- a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
-    <persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        
-        <properties>
-            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="jakarta.persistence.jdbc.user" value="admin"/>
-            <property name="jakarta.persistence.jdbc.password" value="admin"/>
-            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
deleted file mode 100644
index 3be4a9cb15..0000000000
--- a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.sample;
-
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import java.util.function.Consumer;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.Persistence;
-import ${package}.model.Cat;
-import ${package}.model.Person;
-import org.junit.After;
-import org.junit.Before;
-
-public abstract class AbstractSampleTest {
-    
-    protected EntityManagerFactory emf;
-    protected CriteriaBuilderFactory cbf;
-
-    @Before
-    public void init() {
-        emf = Persistence.createEntityManagerFactory("default");
-        CriteriaBuilderConfiguration config = Criteria.getDefault();
-        cbf = config.createCriteriaBuilderFactory(emf);
-        
-        transactional(em -> {
-            Person p1 = new Person("P1");
-            Person p2 = new Person("P2");
-            Person p3 = new Person("P3");
-            em.persist(p1);
-            em.persist(p2);
-            em.persist(p3);
-            
-            Cat c1 = new Cat("C1", 1, p2);
-            Cat c2 = new Cat("C2", 2, p2);
-            Cat c3 = new Cat("C3", 4, p2);
-            
-            Cat c4 = new Cat("C4", 6, p3);
-            
-            Cat c5 = new Cat("C5", 8, null);
-            Cat c6 = new Cat("C6", 7, null);
-            
-            em.persist(c1);
-            em.persist(c2);
-            em.persist(c3);
-            em.persist(c4);
-            em.persist(c5);
-            em.persist(c6);
-            
-            c1.setMother(c3);
-            c3.getKittens().add(c1);
-            
-            c1.setFather(c5);
-            c5.getKittens().add(c1);
-            
-            c2.setMother(c3);
-            c3.getKittens().add(c2);
-            
-            c2.setFather(c6);
-            c6.getKittens().add(c2);
-            
-            c4.setFather(c6);
-            c6.getKittens().add(c4);
-        });
-    }
-    
-    protected void transactional(Consumer<EntityManager> consumer) {
-        EntityManager em = emf.createEntityManager();
-        EntityTransaction tx = em.getTransaction();
-        boolean success = false;
-        
-        try {
-            tx.begin();
-            consumer.accept(em);
-            success = true;
-        } finally {
-            try {
-                if (success) {
-                    tx.commit();
-                } else {
-                    tx.rollback();
-                }
-            } finally {
-                em.close();
-            }
-        }
-    }
-
-    @After
-    public void destruct() {
-        emf.close();
-    }
-}
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
deleted file mode 100644
index 9c93fe9a90..0000000000
--- a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.sample;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import java.util.List;
-import ${package}.model.Cat;
-import ${package}.model.Person;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class SampleTest extends AbstractSampleTest {
-    
-    @Test
-    public void sampleTest() {
-        transactional(em -> {
-            CriteriaBuilder<Person> cb = cbf.create(em, Person.class);
-            cb.from(Cat.class, "cat");
-            cb.where("cat.owner").isNotNull();
-            cb.select("cat.owner");
-            cb.distinct();
-            List<Person> list = cb.getResultList();
-            
-            System.out.println(list);
-            Assert.assertEquals(2, list.size());
-        });
-    }
-}
diff --git a/archetype/core-sample/pom.xml b/archetype/core-sample/pom.xml
index 294411f088..0c795e427c 100644
--- a/archetype/core-sample/pom.xml
+++ b/archetype/core-sample/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/pom.xml b/archetype/core-sample/src/main/resources/archetype-resources/pom.xml
index 342cd0618c..5d572c7247 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/core-sample/src/main/resources/archetype-resources/pom.xml
@@ -16,8 +16,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
     </properties>
@@ -36,9 +36,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.2.8.Final</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-6.6}</version>
         </dependency>
 
         <!-- Core dependencies -->
@@ -52,83 +52,86 @@
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.validation-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
+            <version>${version.activation-api}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
-            <scope>provided</scope>
-        </dependency>
-        
+
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.compiler.plugin}</version>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${version.surefire.plugin}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
index abdb90ab73..427a8c3df9 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ b/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
@@ -7,12 +7,12 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Cat {
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
index 6e55200ef6..add2b18d41 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ b/archetype/core-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
@@ -7,10 +7,10 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class Person {
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/core-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 3a07cacc0b..687a9b9fb0 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/core-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -3,17 +3,17 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="admin"/>
-            <property name="javax.persistence.jdbc.password" value="admin"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+            <property name="jakarta.persistence.jdbc.user" value="admin"/>
+            <property name="jakarta.persistence.jdbc.password" value="admin"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index c0fb8bb244..269db4070e 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -9,21 +9,21 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import ${package}.model.Cat;
 import ${package}.model.Person;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractSampleTest {
     
     protected EntityManagerFactory emf;
     protected CriteriaBuilderFactory cbf;
 
-    @Before
+    @BeforeEach
     public void init() {
         emf = Persistence.createEntityManagerFactory("default");
         CriteriaBuilderConfiguration config = Criteria.getDefault();
@@ -92,7 +92,7 @@ protected void transactional(Consumer<EntityManager> consumer) {
         }
     }
 
-    @After
+    @AfterEach
     public void destruct() {
         emf.close();
     }
diff --git a/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index 9c93fe9a90..2b5d361530 100644
--- a/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/core-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import ${package}.model.Cat;
 import ${package}.model.Person;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SampleTest extends AbstractSampleTest {
     
@@ -25,7 +25,7 @@ public void sampleTest() {
             List<Person> list = cb.getResultList();
             
             System.out.println(list);
-            Assert.assertEquals(2, list.size());
+            assertEquals(2, list.size());
         });
     }
 }
diff --git a/archetype/deltaspike-data-sample/pom.xml b/archetype/deltaspike-data-sample/pom.xml
index 4fac22977a..208103a18e 100644
--- a/archetype/deltaspike-data-sample/pom.xml
+++ b/archetype/deltaspike-data-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/deltaspike-data-sample/src/main/resources/META-INF/maven/archetype.xml b/archetype/deltaspike-data-sample/src/main/resources/META-INF/maven/archetype.xml
index 1585c4b5f4..41b1ac3afa 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/META-INF/maven/archetype.xml
@@ -24,7 +24,7 @@
         <resource>src/main/resources/META-INF/persistence.xml</resource>
         <resource>src/main/resources/META-INF/beans.xml</resource>
         <resource>src/test/resources/META-INF/beans.xml</resource>
-        <resource>src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension</resource>
+        <resource>src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension</resource>
     </resources>
     <testSources>
         <source>src/test/java/sample/AbstractSampleTest.java</source>
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
index b0f38babec..92e2020998 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/pom.xml
@@ -15,16 +15,14 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
-        <version.deltaspike>1.9.3</version.deltaspike>
-        <version.weld>2.4.5.Final</version.weld>
-        <version.hibernate>5.0.12.Final</version.hibernate>
-        <!-- For Hibernate 5.2 use "5.2" -->
-        <version.integration-hibernate>5</version.integration-hibernate>
-        <version.eclipselink>2.6.4</version.eclipselink>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
+        <version.weld>${version.weld}</version.weld>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
+        <version.eclipselink>${version.eclipselink}</version.eclipselink>
     </properties>
 
     <dependencyManagement>
@@ -55,34 +53,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>${version.compiler.plugin}</version>
                 <configuration>
-                    <!-- Enable the following to use preview features e.g. Java 14 records -->
-<!--                    <compilerArgs>&#45;&#45;enable-preview</compilerArgs>-->
+                    <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>${version.surefire.plugin}</version>
                 <configuration>
                     <trimStackTrace>false</trimStackTrace>
-                    <!-- Enable the following to use preview features e.g. Java 14 records -->
-<!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
+                    <argLine>--enable-preview</argLine>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-7.0</artifactId>
-            <version>1.1.0.Final</version>
-            <type>pom</type>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- Core dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
@@ -128,42 +116,90 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
             <artifactId>blaze-persistence-entity-view-processor</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <!-- Platform dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <version>${version.interceptor-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${version.atinject-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${version.cdi-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+            <version>${version.el-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${version.jaxrs-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.validation-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.1</version>
+            <version>${version.jaxb-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
+            <version>${version.activation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
+            <version>${version.ejb-api}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -188,30 +224,17 @@
             <artifactId>weld-se-core</artifactId>
             <version>\${version.weld}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>2.0.4.Final</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -224,18 +247,18 @@
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-${version.integration-hibernate}</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
                     <version>\${version.hibernate}</version>
                     <scope>test</scope>
                 </dependency>
 
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
                     <version>\${version.hibernate}</version>
                     <scope>provided</scope>
@@ -244,55 +267,26 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>\${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>\${version.hibernate}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.blazebit</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>\${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>\${version.hibernate}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.blazebit</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>\${version.blaze-persistence}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -304,12 +298,6 @@
                     <groupId>com.blazebit</groupId>
                     <artifactId>blaze-persistence-integration-eclipselink</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.1</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.eclipse.persistence</groupId>
                     <artifactId>eclipselink</artifactId>
@@ -328,54 +316,24 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>\${additional.source.directory}</source>
-                                        <source>\${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>\${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>\${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>\${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>\${version.eclipselink}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=\${basedir}/src/main/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/Application.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/Application.java
index 3ed0d9f2fb..3db90a1539 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/Application.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/Application.java
@@ -5,9 +5,9 @@
 
 package ${package};
 
-import javax.ws.rs.ApplicationPath;
+import jakarta.ws.rs.ApplicationPath;
 
 @ApplicationPath("/")
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
 }
\ No newline at end of file
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
index 6e0117d850..d864a9da88 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
@@ -9,14 +9,14 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
-
-@javax.ejb.Singleton
-@javax.ejb.Startup
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
+
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class CriteriaBuilderFactoryProducer {
 
     // inject your entity manager factory
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
index 6afb05f4d9..3ffcd36275 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
@@ -5,14 +5,14 @@
 
 package ${package}.config;
 
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
 
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityManagerProducer {
 
     // inject your entity manager factory
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
index 628f192bd2..5473cfc014 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
 
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityViewManagerProducer {
 
     // inject the configuration provided by the cdi integration
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
index eaabde7d84..40622cf00b 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
@@ -6,10 +6,10 @@
 package ${package}.controller;
 
 import ${package}.repository.CatSimpleViewRepository;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.Path;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.Path;
 
 @Path("/")
 public class SampleController {
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
index abdb90ab73..427a8c3df9 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
@@ -7,12 +7,12 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Cat {
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
index 6e55200ef6..add2b18d41 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
@@ -7,10 +7,10 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class Person {
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
index dc74ca17f4..dc988397a1 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
 </beans>
\ No newline at end of file
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 9ae1c0f769..4c9bb3dcd3 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -9,11 +9,11 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="admin"/>
-            <property name="javax.persistence.jdbc.password" value="admin"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+            <property name="jakarta.persistence.jdbc.user" value="admin"/>
+            <property name="jakarta.persistence.jdbc.password" value="admin"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index 59342c1367..6383baa8f5 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -14,20 +14,20 @@
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import ${package}.model.Cat;
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import javax.inject.Inject;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractSampleTest {
 
@@ -40,13 +40,13 @@ public abstract class AbstractSampleTest {
     @Inject
     protected EntityViewManager evm;
 
-    @BeforeClass
+    @BeforeAll
     public static void bootContainer() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.boot();
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdownContainer() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.shutdown();
@@ -58,13 +58,13 @@ public void startContexts() {
         BeanProvider.injectFields(this);
     }
 
-    @After
+    @AfterEach
     public void stopContexts() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.getContextControl().stopContexts();
     }
 
-    @Before
+    @BeforeEach
     public void init() {
         startContexts();
         transactional(em -> {
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
index a779475ef1..f5acf6407e 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
@@ -5,15 +5,15 @@
 
 package ${package}.sample;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Disposes;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index 40270ca4c7..6428cc9294 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -14,9 +14,9 @@
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
 import ${package}.repository.CatSimpleViewRepository;
-import javax.inject.Inject;
-import org.junit.Assert;
-import org.junit.Test;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SampleTest extends AbstractSampleTest {
 
@@ -29,7 +29,7 @@ public void sampleTest() {
             List<CatWithOwnerView> list = catRepository.getWithOwnerView();
             
             System.out.println(list);
-            Assert.assertEquals(6, list.size());
+            assertEquals(6, list.size());
         });
     }
 }
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
index 3b7da685c8..62d90eae86 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
@@ -7,9 +7,9 @@
 
 import ${package}.config.EntityManagerProducer;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 /**
  * In the test, we have to produce the EntityManagerFactory and EntityManager manually
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
index dc74ca17f4..dc988397a1 100644
--- a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
+++ b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
 </beans>
\ No newline at end of file
diff --git a/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to archetype/deltaspike-data-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/archetype/entity-view-sample-jakarta/pom.xml b/archetype/entity-view-sample-jakarta/pom.xml
deleted file mode 100644
index d743114434..0000000000
--- a/archetype/entity-view-sample-jakarta/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-archetype-entity-view-sample-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Archetype Entity-View Sample Jakarta</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.archetype.view.sample</module.name>
-    </properties>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <configuration>
-                        <escapeString>\</escapeString>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>archetype-resources/pom.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>archetype-resources/pom.xml</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-</project>
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml b/archetype/entity-view-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 863e09503a..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-    <id>blaze-persistence-entity-view-sample</id>
-    <sources>
-        <source>src/main/java/model/Cat.java</source>
-        <source>src/main/java/model/Person.java</source>
-        <source>src/main/java/view/CatSimpleView.java</source>
-        <source>src/main/java/view/CatWithOwnerView.java</source>
-        <source>src/main/java/view/PersonSimpleView.java</source>
-    </sources>
-    <resources>
-        <resource>src/main/resources/META-INF/persistence.xml</resource>
-    </resources>
-    <testSources>
-        <source>src/test/java/sample/AbstractSampleTest.java</source>
-        <source>src/test/java/sample/SampleTest.java</source>
-    </testSources>
-</archetype>
\ No newline at end of file
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/pom.xml b/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 118c934b1e..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>\${groupId}</groupId>
-    <artifactId>\${artifactId}</artifactId>
-    <version>\${version}</version>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Entity View Sample</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        
-        <version.blaze-persistence>${project.version}</version.blaze-persistence>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-bom</artifactId>
-                <version>\${version.blaze-persistence}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>6.2.0.CR4</version>
-        </dependency>
-
-        <!-- Core dependencies -->
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-        </dependency>
-
-        <!-- Entity View dependencies -->
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-        </dependency>
-
-        <!-- JDK9+ dependencies -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>3.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>2.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>2.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.200</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Cat.java
deleted file mode 100644
index 427a8c3df9..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.model;
-
-import java.util.HashSet;
-import java.util.Set;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-
-@Entity
-public class Cat {
-    
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    private Integer age;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Person owner;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat mother;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat father;
-    @ManyToMany
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Cat() {
-    }
-
-    public Cat(String name, Integer age, Person owner) {
-        this.name = name;
-        this.age = age;
-        this.owner = owner;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-
-    public Cat getMother() {
-        return mother;
-    }
-
-    public void setMother(Cat mother) {
-        this.mother = mother;
-    }
-
-    public Cat getFather() {
-        return father;
-    }
-
-    public void setFather(Cat father) {
-        this.father = father;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Person.java
deleted file mode 100644
index add2b18d41..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.model;
-
-import java.util.HashSet;
-import java.util.Set;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-
-@Entity
-public class Person {
-    
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    @OneToMany(mappedBy = "owner")
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Person() {
-    }
-
-    public Person(String name) {
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
deleted file mode 100644
index 58f425a577..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.sample;
-
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import java.util.function.Consumer;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.Persistence;
-import ${package}.model.Cat;
-import ${package}.model.Person;
-import ${package}.view.CatSimpleView;
-import ${package}.view.CatWithOwnerView;
-import ${package}.view.PersonSimpleView;
-import org.junit.After;
-import org.junit.Before;
-
-public abstract class AbstractSampleTest {
-    
-    protected EntityManagerFactory emf;
-    protected CriteriaBuilderFactory cbf;
-    protected EntityViewManager evm;
-
-    @Before
-    public void init() {
-        emf = Persistence.createEntityManagerFactory("default");
-        CriteriaBuilderConfiguration config = Criteria.getDefault();
-        cbf = config.createCriteriaBuilderFactory(emf);
-
-        EntityViewConfiguration entityViewConfiguration = EntityViews.createDefaultConfiguration();
-
-        for (Class<?> entityViewClazz : getEntityViewClasses()) {
-            entityViewConfiguration.addEntityView(entityViewClazz);
-        }
-
-        evm = entityViewConfiguration.createEntityViewManager(cbf);
-        
-        transactional(em -> {
-            Person p1 = new Person("P1");
-            Person p2 = new Person("P2");
-            Person p3 = new Person("P3");
-            em.persist(p1);
-            em.persist(p2);
-            em.persist(p3);
-            
-            Cat c1 = new Cat("C1", 1, p2);
-            Cat c2 = new Cat("C2", 2, p2);
-            Cat c3 = new Cat("C3", 4, p2);
-            
-            Cat c4 = new Cat("C4", 6, p3);
-            
-            Cat c5 = new Cat("C5", 8, null);
-            Cat c6 = new Cat("C6", 7, null);
-            
-            em.persist(c1);
-            em.persist(c2);
-            em.persist(c3);
-            em.persist(c4);
-            em.persist(c5);
-            em.persist(c6);
-            
-            c1.setMother(c3);
-            c3.getKittens().add(c1);
-            
-            c1.setFather(c5);
-            c5.getKittens().add(c1);
-            
-            c2.setMother(c3);
-            c3.getKittens().add(c2);
-            
-            c2.setFather(c6);
-            c6.getKittens().add(c2);
-            
-            c4.setFather(c6);
-            c6.getKittens().add(c4);
-        });
-    }
-
-    protected abstract Class<?>[] getEntityViewClasses();
-    
-    protected void transactional(Consumer<EntityManager> consumer) {
-        EntityManager em = emf.createEntityManager();
-        EntityTransaction tx = em.getTransaction();
-        boolean success = false;
-        
-        try {
-            tx.begin();
-            consumer.accept(em);
-            success = true;
-        } finally {
-            try {
-                if (success) {
-                    tx.commit();
-                } else {
-                    tx.rollback();
-                }
-            } finally {
-                em.close();
-            }
-        }
-    }
-
-    @After
-    public void destruct() {
-        emf.close();
-    }
-}
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
deleted file mode 100644
index 994fa01d73..0000000000
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.sample;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.view.EntityViewSetting;
-import java.util.List;
-import ${package}.model.Cat;
-import ${package}.model.Person;
-import ${package}.view.CatSimpleView;
-import ${package}.view.CatWithOwnerView;
-import ${package}.view.PersonSimpleView;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class SampleTest extends AbstractSampleTest {
-
-    @Override
-    protected Class<?>[] getEntityViewClasses() {
-        return new Class[] {
-                CatSimpleView.class,
-                CatWithOwnerView.class,
-                PersonSimpleView.class
-        };
-    }
-    
-    @Test
-    public void sampleTest() {
-        transactional(em -> {
-            CriteriaBuilder<Cat> catCriteriaBuilder = cbf.create(em, Cat.class);
-            catCriteriaBuilder.from(Cat.class, "cat");
-
-            EntityViewSetting<CatWithOwnerView, CriteriaBuilder<CatWithOwnerView>> setting = EntityViewSetting.create(CatWithOwnerView.class);
-            CriteriaBuilder<CatWithOwnerView> cb = evm.applySetting(setting, catCriteriaBuilder);
-            List<CatWithOwnerView> list = cb.getResultList();
-            
-            System.out.println(list);
-            Assert.assertEquals(6, list.size());
-        });
-    }
-}
diff --git a/archetype/entity-view-sample/pom.xml b/archetype/entity-view-sample/pom.xml
index 50381c79cc..53000bbb1c 100644
--- a/archetype/entity-view-sample/pom.xml
+++ b/archetype/entity-view-sample/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/pom.xml b/archetype/entity-view-sample/src/main/resources/archetype-resources/pom.xml
index 5c80032bb1..d44eead975 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/pom.xml
@@ -16,8 +16,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
     </properties>
@@ -36,9 +36,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.2.8.Final</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-6.6}</version>
         </dependency>
 
         <!-- Core dependencies -->
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
         <!-- Entity View dependencies -->
@@ -69,80 +69,83 @@
             <artifactId>blaze-persistence-entity-view-processor</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.validation-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
+            <version>${version.activation-api}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
-            <scope>provided</scope>
-        </dependency>
-        
+
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.compiler.plugin}</version>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${version.surefire.plugin}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
index abdb90ab73..427a8c3df9 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
@@ -7,12 +7,12 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Cat {
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
index 6e55200ef6..add2b18d41 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
@@ -7,10 +7,10 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class Person {
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 3a07cacc0b..687a9b9fb0 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -3,17 +3,17 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="admin"/>
-            <property name="javax.persistence.jdbc.password" value="admin"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+            <property name="jakarta.persistence.jdbc.user" value="admin"/>
+            <property name="jakarta.persistence.jdbc.password" value="admin"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index f512923e97..4fbb6acaa0 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -12,17 +12,17 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import ${package}.model.Cat;
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractSampleTest {
     
@@ -30,7 +30,7 @@ public abstract class AbstractSampleTest {
     protected CriteriaBuilderFactory cbf;
     protected EntityViewManager evm;
 
-    @Before
+    @BeforeEach
     public void init() {
         emf = Persistence.createEntityManagerFactory("default");
         CriteriaBuilderConfiguration config = Criteria.getDefault();
@@ -109,7 +109,7 @@ protected void transactional(Consumer<EntityManager> consumer) {
         }
     }
 
-    @After
+    @AfterEach
     public void destruct() {
         emf.close();
     }
diff --git a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index 994fa01d73..338620a96e 100644
--- a/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/entity-view-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -13,8 +13,8 @@
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SampleTest extends AbstractSampleTest {
 
@@ -38,7 +38,7 @@ public void sampleTest() {
             List<CatWithOwnerView> list = cb.getResultList();
             
             System.out.println(list);
-            Assert.assertEquals(6, list.size());
+            assertEquals(6, list.size());
         });
     }
 }
diff --git a/archetype/java-ee-sample/pom.xml b/archetype/jakarta-ee-sample/pom.xml
similarity index 93%
rename from archetype/java-ee-sample/pom.xml
rename to archetype/jakarta-ee-sample/pom.xml
index 06858912a5..af55d9408e 100644
--- a/archetype/java-ee-sample/pom.xml
+++ b/archetype/jakarta-ee-sample/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blaze-persistence-archetype-java-ee-sample</artifactId>
+    <artifactId>blaze-persistence-archetype-jakarta-ee-sample</artifactId>
 
     <name>Blazebit Persistence Archetype Java EE Sample</name>
 
diff --git a/archetype/java-ee-sample/src/main/resources/META-INF/maven/archetype.xml b/archetype/jakarta-ee-sample/src/main/resources/META-INF/maven/archetype.xml
similarity index 94%
rename from archetype/java-ee-sample/src/main/resources/META-INF/maven/archetype.xml
rename to archetype/jakarta-ee-sample/src/main/resources/META-INF/maven/archetype.xml
index 1585c4b5f4..41b1ac3afa 100644
--- a/archetype/java-ee-sample/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetype/jakarta-ee-sample/src/main/resources/META-INF/maven/archetype.xml
@@ -24,7 +24,7 @@
         <resource>src/main/resources/META-INF/persistence.xml</resource>
         <resource>src/main/resources/META-INF/beans.xml</resource>
         <resource>src/test/resources/META-INF/beans.xml</resource>
-        <resource>src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension</resource>
+        <resource>src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension</resource>
     </resources>
     <testSources>
         <source>src/test/java/sample/AbstractSampleTest.java</source>
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/pom.xml b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/pom.xml
similarity index 69%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/pom.xml
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/pom.xml
index 1abd67bc5b..9f335086b4 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/pom.xml
@@ -15,12 +15,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
-        <version.deltaspike>1.9.3</version.deltaspike>
-        <version.weld>2.4.5.Final</version.weld>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
+        <version.weld>${version.weld}</version.weld>
     </properties>
 
     <dependencyManagement>
@@ -51,34 +51,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>${version.compiler.plugin}</version>
                 <configuration>
-                    <!-- Enable the following to use preview features e.g. Java 14 records -->
-<!--                    <compilerArgs>&#45;&#45;enable-preview</compilerArgs>-->
+                    <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>${version.surefire.plugin}</version>
                 <configuration>
                     <trimStackTrace>false</trimStackTrace>
-                    <!-- Enable the following to use preview features e.g. Java 14 records -->
-<!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
+                    <argLine>--enable-preview</argLine>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-7.0</artifactId>
-            <version>1.1.0.Final</version>
-            <type>pom</type>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- Core dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
@@ -109,35 +99,83 @@
             <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <!-- Platform dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jakarta-jpa-3.1-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <version>${version.jakarta-interceptor}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${version.jakarta-atinject-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${version.jakarta-cdi-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+            <version>${version.jakarta-el-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${version.jaxrs-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.jakarta-validation}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jakarta-jaxb-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jakarta-jaxb}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.jakarta-annotation}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
+            <version>${version.jakarta-activation}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
+            <version>${version.jakarta-ejb}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -155,7 +193,7 @@
         <dependency>
             <groupId>org.apache.deltaspike.core</groupId>
             <artifactId>deltaspike-core-impl</artifactId>
-            <scope>test</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -177,30 +215,17 @@
             <artifactId>weld-se-core</artifactId>
             <version>\${version.weld}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>2.0.4.Final</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -213,12 +238,12 @@
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>5.0.12.Final</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -230,16 +255,10 @@
                     <groupId>com.blazebit</groupId>
                     <artifactId>blaze-persistence-integration-eclipselink</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.1</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.eclipse.persistence</groupId>
                     <artifactId>eclipselink</artifactId>
-                    <version>2.6.4</version>
+                    <version>${version.eclipselink}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java
similarity index 52%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java
index 3ed0d9f2fb..3db90a1539 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/Application.java
@@ -5,9 +5,9 @@
 
 package ${package};
 
-import javax.ws.rs.ApplicationPath;
+import jakarta.ws.rs.ApplicationPath;
 
 @ApplicationPath("/")
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
 }
\ No newline at end of file
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
similarity index 77%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
index 3044b13d5f..9d5b927d4a 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/CriteriaBuilderFactoryProducer.java
@@ -9,14 +9,14 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
-import javax.persistence.EntityManagerFactory;
-
-@javax.ejb.Singleton
-@javax.ejb.Startup
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.persistence.EntityManagerFactory;
+
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class CriteriaBuilderFactoryProducer {
 
     // inject your entity manager factory
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
similarity index 57%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
index 6afb05f4d9..3ffcd36275 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityManagerProducer.java
@@ -5,14 +5,14 @@
 
 package ${package}.config;
 
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
 
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityManagerProducer {
 
     // inject your entity manager factory
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
similarity index 81%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
index 628f192bd2..5473cfc014 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/config/EntityViewManagerProducer.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
 
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityViewManagerProducer {
 
     // inject the configuration provided by the cdi integration
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
similarity index 76%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
index eaabde7d84..40622cf00b 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/controller/SampleController.java
@@ -6,10 +6,10 @@
 package ${package}.controller;
 
 import ${package}.repository.CatSimpleViewRepository;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.Path;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.Path;
 
 @Path("/")
 public class SampleController {
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
similarity index 100%
rename from archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Cat.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
diff --git a/archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
similarity index 100%
rename from archetype/core-sample-jakarta/src/main/resources/archetype-resources/src/main/java/model/Person.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java
similarity index 77%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java
index 697543c7b7..16c59200ff 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/repository/CatSimpleViewRepository.java
@@ -10,14 +10,14 @@
 
 import java.util.List;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
 
 import ${package}.model.*;
 import ${package}.view.*;
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java
similarity index 100%
rename from archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java
similarity index 100%
rename from archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java
similarity index 100%
rename from archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java
diff --git a/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..dc988397a1
--- /dev/null
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  Copyright Blazebit
+  -->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
similarity index 67%
rename from archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 687a9b9fb0..4c9bb3dcd3 100644
--- a/archetype/entity-view-sample-jakarta/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -3,11 +3,11 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
-    <persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+    <persistence-unit name="default">
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        
+
         <properties>
             <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
             <property name="jakarta.persistence.jdbc.user" value="admin"/>
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
similarity index 88%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index 59342c1367..6383baa8f5 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -14,20 +14,20 @@
 import org.apache.deltaspike.cdise.api.CdiContainerLoader;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import ${package}.model.Cat;
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import javax.inject.Inject;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractSampleTest {
 
@@ -40,13 +40,13 @@ public abstract class AbstractSampleTest {
     @Inject
     protected EntityViewManager evm;
 
-    @BeforeClass
+    @BeforeAll
     public static void bootContainer() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.boot();
     }
 
-    @AfterClass
+    @AfterAll
     public static void shutdownContainer() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.shutdown();
@@ -58,13 +58,13 @@ public void startContexts() {
         BeanProvider.injectFields(this);
     }
 
-    @After
+    @AfterEach
     public void stopContexts() {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
         container.getContextControl().stopContexts();
     }
 
-    @Before
+    @BeforeEach
     public void init() {
         startContexts();
         transactional(em -> {
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
similarity index 70%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
index a779475ef1..f5acf6407e 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/EntityManagerFactoryHolder.java
@@ -5,15 +5,15 @@
 
 package ${package}.sample;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Disposes;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
similarity index 89%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index a8145bf92f..7dfe92087c 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -13,8 +13,8 @@
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SampleTest extends AbstractSampleTest {
 
@@ -29,7 +29,7 @@ public void sampleTest() {
             List<CatWithOwnerView> list = cb.getResultList();
 
             System.out.println(list);
-            Assert.assertEquals(6, list.size());
+            assertEquals(6, list.size());
         });
     }
 }
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
similarity index 76%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
index 3b7da685c8..62d90eae86 100644
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/java/sample/TestExtension.java
@@ -7,9 +7,9 @@
 
 import ${package}.config.EntityManagerProducer;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 /**
  * In the test, we have to produce the EntityManagerFactory and EntityManager manually
diff --git a/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..dc988397a1
--- /dev/null
+++ b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  Copyright Blazebit
+  -->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to archetype/jakarta-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
deleted file mode 100644
index abdb90ab73..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.model;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Cat {
-    
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    private Integer age;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Person owner;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat mother;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat father;
-    @ManyToMany
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Cat() {
-    }
-
-    public Cat(String name, Integer age, Person owner) {
-        this.name = name;
-        this.age = age;
-        this.owner = owner;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-
-    public Cat getMother() {
-        return mother;
-    }
-
-    public void setMother(Cat mother) {
-        this.mother = mother;
-    }
-
-    public Cat getFather() {
-        return father;
-    }
-
-    public void setFather(Cat father) {
-        this.father = father;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
deleted file mode 100644
index 6e55200ef6..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.model;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
-@Entity
-public class Person {
-    
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    @OneToMany(mappedBy = "owner")
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Person() {
-    }
-
-    public Person(String name) {
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java
deleted file mode 100644
index 440e856e98..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatSimpleView.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.view;
-
-import com.blazebit.persistence.view.*;
-import ${package}.model.*;
-
-@EntityView(Cat.class)
-public interface CatSimpleView {
-    
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java
deleted file mode 100644
index e436338b7b..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/CatWithOwnerView.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.view;
-
-import com.blazebit.persistence.view.*;
-import ${package}.model.*;
-
-@EntityView(Cat.class)
-public interface CatWithOwnerView extends CatSimpleView {
-    
-    PersonSimpleView getOwner();
-
-}
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java
deleted file mode 100644
index 82b6d5cff4..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/java/view/PersonSimpleView.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package ${package}.view;
-
-import com.blazebit.persistence.view.*;
-import ${package}.model.*;
-
-@EntityView(Person.class)
-public interface PersonSimpleView {
-    
-    @IdMapping
-    Long getId();
-
-    String getName();
-
-}
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index dc74ca17f4..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>
\ No newline at end of file
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 9ae1c0f769..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    <persistence-unit name="default">
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="admin"/>
-            <property name="javax.persistence.jdbc.password" value="admin"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml b/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index dc74ca17f4..0000000000
--- a/archetype/java-ee-sample/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>
\ No newline at end of file
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 3b63b7c0df..4dc97ddee8 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -23,9 +23,6 @@
         <module>spring-data-sample</module>
         <module>spring-boot-sample</module>
         <module>deltaspike-data-sample</module>
-        <module>java-ee-sample</module>
-
-        <module>core-sample-jakarta</module>
-        <module>entity-view-sample-jakarta</module>
+        <module>jakarta-ee-sample</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/archetype/spring-boot-sample/pom.xml b/archetype/spring-boot-sample/pom.xml
index 266eb84c4d..2207f1b7cd 100644
--- a/archetype/spring-boot-sample/pom.xml
+++ b/archetype/spring-boot-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/pom.xml b/archetype/spring-boot-sample/src/main/resources/archetype-resources/pom.xml
index 5a48f32085..82431c0569 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0</version>
+        <version>${version.spring-data-latest-spring-boot}</version>
     </parent>
 
     <groupId>\${groupId}</groupId>
@@ -21,10 +21,11 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
     </properties>
 
     <dependencyManagement>
@@ -60,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
         <!-- Entity View dependencies -->
@@ -80,7 +81,7 @@
         <!-- Spring integration dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -98,46 +99,64 @@
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.validation-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb-api}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
+            <version>${version.activation-api}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -151,35 +170,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.compiler.plugin}</version>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${version.surefire.plugin}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
index 0ea6e6a34b..2dc1707ab4 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 @Configuration
 @EnableEntityViews(basePackages = { "${package}.view"})
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
index abdb90ab73..427a8c3df9 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
@@ -7,12 +7,12 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Cat {
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
index 6e55200ef6..add2b18d41 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
@@ -7,10 +7,10 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class Person {
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index 030b6dc781..b5bdd57707 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -5,14 +5,14 @@
 
 package ${package}.sample;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import ${package}.model.Cat;
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,7 +22,7 @@ public abstract class AbstractSampleTest {
     @Autowired
     protected EntityManager em;
 
-    @Before
+    @BeforeEach
     public void init() {
         Person p1 = new Person("P1");
         Person p2 = new Person("P2");
diff --git a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index 8da11333c2..827e032a9c 100644
--- a/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -12,17 +12,17 @@
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.repository.CatSimpleViewRepository;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.*;
 import org.springframework.context.annotation.*;
 import org.springframework.beans.factory.annotation.*;
 import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
 import com.blazebit.persistence.spring.data.repository.config.EnableBlazeRepositories;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SampleTest.TestConfig.class)
 public class SampleTest extends AbstractSampleTest {
 
@@ -34,7 +34,7 @@ public void sampleTest() {
         final Iterable<CatSimpleView> listIterable = catSimpleViewRepository.findAll();
         final List<CatSimpleView> list = new ArrayList<>();
         listIterable.forEach(view -> list.add(view));
-        Assert.assertEquals(6, list.size());
+        assertEquals(6, list.size());
     }
 
     @Configuration
diff --git a/archetype/spring-data-sample/pom.xml b/archetype/spring-data-sample/pom.xml
index 62ec5db0f0..d1ed5ad0ee 100644
--- a/archetype/spring-data-sample/pom.xml
+++ b/archetype/spring-data-sample/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/pom.xml b/archetype/spring-data-sample/src/main/resources/archetype-resources/pom.xml
index 2d16f708a2..3a43bc8cff 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/pom.xml
@@ -16,11 +16,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <version.blaze-persistence>${project.version}</version.blaze-persistence>
-        <version.spring>${version.spring-data-2.4-spring}</version.spring>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
+        <version.spring>${version.spring-data-latest-spring}</version.spring>
+        <version.spring.data>${version.spring-data-latest}</version.spring.data>
     </properties>
 
     <dependencyManagement>
@@ -44,9 +46,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.4.6.Final</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>\${version.hibernate}</version>
         </dependency>
 
         <!-- Core dependencies -->
@@ -60,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
         <!-- Entity View dependencies -->
@@ -80,7 +82,7 @@
         <!-- Spring integration dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -95,57 +97,68 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.4}</version>
+            <version>\${version.spring.data}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
         </dependency>
 
-        <!-- JDK9+ dependencies -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${version.validation-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <version>${version.jaxb}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>1.3.3</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
+            <version>${version.activation-api}</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,33 +167,25 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <compilerArgs>--enable-preview</compilerArgs>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M3</version>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <argLine>--enable-preview</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.compiler.plugin}</version>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${version.surefire.plugin}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
index 0ea6e6a34b..2dc1707ab4 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 @Configuration
 @EnableEntityViews(basePackages = { "${package}.view"})
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
index abdb90ab73..427a8c3df9 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Cat.java
@@ -7,12 +7,12 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Cat {
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
index 6e55200ef6..add2b18d41 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/model/Person.java
@@ -7,10 +7,10 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class Person {
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/application-config.xml b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/application-config.xml
index b2461c6e12..fff7662ea2 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/application-config.xml
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/application-config.xml
@@ -12,12 +12,12 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
 
     <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
 
-    <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
     </bean>
 
     <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="myEmf"/>
+        <property name="entityManagerFactory" ref="entityManagerFactory"/>
     </bean>
 
     <tx:annotation-driven />
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 0ecc6846dc..ad21f65534 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -11,11 +11,11 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="admin"/>
-            <property name="javax.persistence.jdbc.password" value="admin"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+            <property name="jakarta.persistence.jdbc.user" value="admin"/>
+            <property name="jakarta.persistence.jdbc.password" value="admin"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
index 47b5e53ab9..91bccb263f 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/AbstractSampleTest.java
@@ -6,23 +6,23 @@
 package ${package}.sample;
 
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import ${package}.model.Cat;
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.view.CatWithOwnerView;
 import ${package}.view.PersonSimpleView;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractSampleTest {
     
     protected EntityManagerFactory emf;
 
-    @Before
+    @BeforeEach
     public void init() {
         emf = Persistence.createEntityManagerFactory("default");
 
@@ -97,7 +97,7 @@ protected void transactional(Consumer<EntityManager> consumer) {
         }
     }
 
-    @After
+    @AfterEach
     public void destruct() {
         emf.close();
     }
diff --git a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
index b5d2b175a1..308c98f3b4 100644
--- a/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
+++ b/archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java
@@ -12,17 +12,17 @@
 import ${package}.model.Person;
 import ${package}.view.CatSimpleView;
 import ${package}.repository.CatSimpleViewRepository;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.*;
 import org.springframework.context.annotation.*;
 import org.springframework.beans.factory.annotation.*;
 import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
 import com.blazebit.persistence.spring.data.repository.config.EnableBlazeRepositories;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SampleTest.TestConfig.class)
 public class SampleTest extends AbstractSampleTest {
 
@@ -35,7 +35,7 @@ public void sampleTest() {
             final Iterable<CatSimpleView> listIterable = catSimpleViewRepository.findAll();
             final List<CatSimpleView> list = new ArrayList<>();
             listIterable.forEach(view -> list.add(view));
-            Assert.assertEquals(6, list.size());
+            assertEquals(6, list.size());
         });
     }
 
@@ -43,9 +43,7 @@ public void sampleTest() {
     @ComponentScan("${package}")
     @ImportResource("/META-INF/application-config.xml")
     @EnableEntityViews(basePackages = { "${package}.view"})
-    @EnableBlazeRepositories(
-            basePackages = "${package}.repository",
-            entityManagerFactoryRef = "myEmf")
+    @EnableBlazeRepositories(basePackages = "${package}.repository")
     static class TestConfig {
     }
 }
diff --git a/build-local.sh b/build-local.sh
index c306278dbd..7ce75c3835 100755
--- a/build-local.sh
+++ b/build-local.sh
@@ -11,20 +11,18 @@ BUILD="$3"
 PROPERTIES=
 
 if [ "$JPA_PROVIDER" == "" ]; then
-	echo "JPA provider (hibernate-4.2, hibernate-4.3, hibernate-5.0, hibernate-5.1, hibernate-5.2, datanucleus-4, datanucleus-5, eclipselink, openjpa) [hibernate-5.2]: "
+	echo "JPA provider (hibernate-6.6, hibernate-6.4, hibernate-6.2, eclipselink) [hibernate-6.6]: "
 	read input </dev/tty
 	
 	if [ "$input" == "" ]; then
-		JPA_PROVIDER="hibernate-5.2"
-	elif [ "$input" == "hibernate-4.2" ]; then
-		JPA_PROVIDER="hibernate"
+		JPA_PROVIDER="hibernate-6.6"
 	else
 		JPA_PROVIDER=$input
 	fi
 fi
 
 if [ "$DBMS" == "" ]; then
-	echo "DBMS (h2, mysql, postgresql, sqlite, db2, firebird, oracle, mssql) [h2]: "
+	echo "DBMS (h2, mysql, postgresql, db2, oracle, mssql) [h2]: "
 	read input </dev/tty
 	
 	if [ "$input" == "" ]; then
diff --git a/build.sh b/build.sh
index fcc09de6bd..7f38863feb 100755
--- a/build.sh
+++ b/build.sh
@@ -28,20 +28,11 @@ if [[ "$BUILD_JDK" != "" ]]; then
   if [[ "$BUILD_JDK" == *-ea ]]; then
     export BUILD_JDK=${BUILD_JDK::-3}
   fi
-  PROPERTIES="$PROPERTIES -Dmain.java.version=$BUILD_JDK -Dtest.java.version=$BUILD_JDK -Djdk8.home=$JDK8_HOME"
+  PROPERTIES="$PROPERTIES -Dmain.java.version=$BUILD_JDK -Dtest.java.version=$BUILD_JDK"
   if [[ "$BUILD_JDK" == "21" ]] || [[ "$BUILD_JDK" == "22" ]]; then
     # Until Deltaspike releases a version with ASM 9.5, we have to exclude these parts from the build
     PROPERTIES="-pl !integration/deltaspike-data/testsuite $PROPERTIES"
-#    PROPERTIES="-pl !integration/deltaspike-data/testsuite,!examples/deltaspike-data-rest,!integration/quarkus/deployment,!integration/quarkus/runtime,!examples/quarkus/testsuite/base,!examples/quarkus/base $PROPERTIES"
-#  else
-    # Unfortunately we have to exclude quarkus tests with Java 9+ due to the MR-JAR issue: https://github.com/quarkusio/quarkus/issues/13892
-  #PROPERTIES="-pl !integration/quarkus/deployment,!integration/quarkus/runtime,!examples/quarkus/testsuite/base,!examples/quarkus/base $PROPERTIES"
   fi
-#else
-  #if [ "$JPAPROVIDER" == "hibernate-5.2" ] && [ "$JDK" != "8" ]; then
-    # Unfortunately we have to exclude quarkus tests with Java 9+ due to the MR-JAR issue: https://github.com/quarkusio/quarkus/issues/13892
-    #PROPERTIES="-pl !integration/quarkus/deployment,!integration/quarkus/runtime,!examples/quarkus/testsuite/base,!examples/quarkus/base $PROPERTIES"
-  #fi
 fi
 
 if [[ "$JDK" != "" ]]; then
@@ -52,15 +43,10 @@ if [[ "$JDK" != "" ]]; then
     # As of JDK 21 Javac produces parameter attributes with a null name that old BND versions can't read
     PROPERTIES="$PROPERTIES -Dversion.bnd=7.0.0"
   fi
-  PROPERTIES="$PROPERTIES -Djdk8.home=$JDK8_HOME"
-fi
-
-if [[ "$JPAPROVIDER" == hibernate-6* ]]; then
-  ADDITIONAL_PROFILES=,jakarta
 fi
 
 if [[ "$NATIVE" == "true" ]]; then
-  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-2.7.x},${DELTASPIKE:-deltaspike-1.9},native${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
+  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.3.x},${DELTASPIKE:-deltaspike-2.0},native${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
 else
-  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-2.7.x},${DELTASPIKE:-deltaspike-1.9}${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
+  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.3.x},${DELTASPIKE:-deltaspike-2.0}${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
 fi
\ No newline at end of file
diff --git a/checkstyle-rules/pom.xml b/checkstyle-rules/pom.xml
index ce8e99b201..02a3766f75 100644
--- a/checkstyle-rules/pom.xml
+++ b/checkstyle-rules/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,6 @@
     <name>Blazebit Persistence Checkstyle Rules</name>
     <properties>
         <module.name>com.blazebit.persistence.checkstyle.rules</module.name>
-        <main.java.version>1.8</main.java.version>
     </properties>
     
     <dependencies>
diff --git a/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml b/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml
index 027e0a0eea..1e89d0e63e 100644
--- a/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml
+++ b/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml
@@ -28,6 +28,8 @@
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]impl[\\/]query[\\/]ParameterMetadataProviderImpl\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]AbstractCriteriaQueryParameterBinder\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]AbstractPartTreeBlazePersistenceQuery\.java$"/>
+    <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]QueryUtils\.java$"/>
+    <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]FixedJpaQueryCreator\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]repository[\\/]EntityViewAwareCrudMethodMetadataPostProcessor\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]impl[\\/]repository[\\/]BlazePersistenceRepositoryFactory\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]impl[\\/]repository[\\/]DefaultRepositoryInformation\.java$"/>
@@ -38,7 +40,7 @@
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]webflux[\\/]impl[\\/]SortHandlerMethodArgumentResolver\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]webflux[\\/]impl[\\/]SortArgumentResolver\.java$"/>
 
-    <suppress checks="." files="[\\/]org[\\/]springframework[\\/]data[\\/]repository[\\/]config[\\/].*\.java$"/>
+    <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]repository[\\/]config[\\/]BootstrapMode\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]integration[\\/]jsonb[\\/]jsonstructure[\\/].*\.java$"/>
 
     <!-- The implementation, testsuite and examples don't have to fit our Javadoc requirements -->
diff --git a/ci/build-github-latest.sh b/ci/build-github-latest.sh
index f7eb31f458..518c4213bb 100755
--- a/ci/build-github-latest.sh
+++ b/ci/build-github-latest.sh
@@ -12,18 +12,14 @@ elif [ "$COMPONENT" == 'hibernate-6.4' ]; then
   export JPAPROVIDER="hibernate-6.4"
   export SPRING_DATA="spring-data-3.2.x"
   export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.4=[6.4,6.5.Alpha)"
-elif [ "$COMPONENT" == 'hibernate-6.5' ]; then
-  export JPAPROVIDER="hibernate-6.5"
-  export SPRING_DATA="spring-data-3.3.x"
-  export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.5=[6.5,6.6.Alpha)"
 elif [ "$COMPONENT" == 'hibernate-6.6' ]; then
   export JPAPROVIDER="hibernate-6.6"
   export SPRING_DATA="spring-data-3.3.x"
-  export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.6=[6.6,6.6.Alpha)"
+  export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.6=[6.6,7.0.Alpha)"
 else
-  export JPAPROVIDER="hibernate-6.2"
-  export SPRING_DATA="spring-data-3.1.x"
-  export PROPERTIES="-Dversion.spring-data-3.1=[3,4.Alpha) -Dversion.spring-data-3.1-spring=[6.0,6.1.Alpha) -Dversion.spring-data-3.1-spring-boot=[3,4.Alpha)"
+  export JPAPROVIDER="hibernate-6.6"
+  export SPRING_DATA="spring-data-3.3.x"
+  export PROPERTIES="-Dversion.spring-data-3.3=[3,4.Alpha) -Dversion.spring-data-3.3-spring=[6.0,6.1.Alpha) -Dversion.spring-data-3.3-spring-boot=[3,4.Alpha)"
 fi
 
 exec bash $DIR/../build.sh
\ No newline at end of file
diff --git a/ci/build-github.sh b/ci/build-github.sh
index 950920cb08..36c7c26151 100755
--- a/ci/build-github.sh
+++ b/ci/build-github.sh
@@ -5,8 +5,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 java -version
 
 if [ "$RDBMS" == 'mysql' ]; then
-  bash $DIR/../docker_db.sh mysql_5_7
-elif [ "$RDBMS" == 'mysql8' ]; then
   bash $DIR/../docker_db.sh mysql
 elif [ "$RDBMS" == 'postgresql' ]; then
   bash $DIR/../docker_db.sh postgresql
diff --git a/ci/build-travis.sh b/ci/build-travis.sh
deleted file mode 100755
index 3728bd4e08..0000000000
--- a/ci/build-travis.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-java -version
-
-if [ "$NATIVE" = "true" ]; then
-  sudo add-apt-repository -y ppa:jonathonf/python-3.6
-  sudo apt-get update
-  sudo apt-get install -y python3-pip
-  yes | sudo pip3 install git+https://github.com/naftulikay/travis-pls
-  source setup-graalvm.sh
-fi
-
-if [ "$RDBMS" == 'mysql' ]; then
-  sudo service mysql stop
-  bash $DIR/../docker_db.sh mysql_5_7
-elif [ "$RDBMS" == 'mysql8' ]; then
-  sudo service mysql stop
-  bash $DIR/../docker_db.sh mysql
-elif [ "$RDBMS" == 'postgresql' ]; then
-  sudo service postgres stop
-  bash $DIR/../docker_db.sh postgresql
-elif [ "$RDBMS" == 'db2' ]; then
-  bash $DIR/../docker_db.sh db2
-elif [ "$RDBMS" == 'oracle' ]; then
-  bash $DIR/../docker_db.sh oracle
-elif [ "$RDBMS" == 'mssql' ]; then
-  bash $DIR/../docker_db.sh mssql
-fi
-
-exec bash $DIR/../build.sh
\ No newline at end of file
diff --git a/ci/deploy-snapshot-travis.sh b/ci/deploy-snapshot-travis.sh
deleted file mode 100755
index 76a6417ebc..0000000000
--- a/ci/deploy-snapshot-travis.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-if [ "$TRAVIS_REPO_SLUG" == "Blazebit/blaze-persistence" ] && 
-    [ "$TRAVIS_BRANCH" == "main" ] &&
-    [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
-    [ "$SNAPSHOT_PUBLISH" == "true" ]; then
-
-  exec bash $DIR/deploy-snapshot.sh
-else
-  echo "Skipping snapshot deployment..."
-fi
diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh
index b74b622e2d..ec2b3a012a 100755
--- a/ci/deploy-snapshot.sh
+++ b/ci/deploy-snapshot.sh
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 echo "Starting snapshot deployment..."
 export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-exec $DIR/../mvnw -B -P "blazebit-release,spring-data-2.7.x,deltaspike-1.9,hibernate-5.6" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipITs -Dgpg.skip=true -Dquiet=true -Djdk8.home=$JDK8_HOME clean deploy
+exec $DIR/../mvnw -B -P "blazebit-release,spring-data-3.3.x,deltaspike-2.0,hibernate-6.6" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipITs -Dgpg.skip=true -Dquiet=true clean deploy
diff --git a/core/api-jakarta/pom.xml b/core/api-jakarta/pom.xml
deleted file mode 100644
index b001f7b5d2..0000000000
--- a/core/api-jakarta/pom.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-core-api:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-api:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-api:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- IntelliJ needs the source to be available to not complain about implementations, so we provide that... -->
-                    <execution>
-                        <id>unpack-sources</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}-sources.jar" dest="${project.build.directory}/java/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>intellij-fake-attach-source</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/java/</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/api-jar/pom.xml b/core/api-jar/pom.xml
deleted file mode 100644
index 5c52cf371b..0000000000
--- a/core/api-jar/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-api-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-core-api</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-core-api</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index 6d67786de3..55b0e20caf 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,97 +24,11 @@
     </properties>
 
     <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive java.sql;
-                                        requires transitive java.persistence;
-                                        exports com.blazebit.persistence;
-                                        exports com.blazebit.persistence.spi;
-                                        exports com.blazebit.persistence.internal;
-                                        uses com.blazebit.persistence.spi.CriteriaBuilderConfigurationProvider;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>java9</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-            </activation>
-            <properties>
-                <jdkSpecificSourceDirectory>src/main/java9</jdkSpecificSourceDirectory>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-java9</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Multi-Release>true</Multi-Release>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/api/src/main/java/com/blazebit/persistence/BaseSubqueryBuilder.java b/core/api/src/main/java/com/blazebit/persistence/BaseSubqueryBuilder.java
index 3c903f9cb5..54cb34bd25 100644
--- a/core/api/src/main/java/com/blazebit/persistence/BaseSubqueryBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/BaseSubqueryBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 /**
  * A builder for subquery criteria queries.
diff --git a/core/api/src/main/java/com/blazebit/persistence/CommonQueryBuilder.java b/core/api/src/main/java/com/blazebit/persistence/CommonQueryBuilder.java
index 2cc7a5e0be..5c4c39df81 100644
--- a/core/api/src/main/java/com/blazebit/persistence/CommonQueryBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/CommonQueryBuilder.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.spi.JpqlMacro;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
 import java.util.Map;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/ConfigurationProperties.java b/core/api/src/main/java/com/blazebit/persistence/ConfigurationProperties.java
index 94f75014a6..8a5eee3edc 100644
--- a/core/api/src/main/java/com/blazebit/persistence/ConfigurationProperties.java
+++ b/core/api/src/main/java/com/blazebit/persistence/ConfigurationProperties.java
@@ -191,7 +191,7 @@ public final class ConfigurationProperties {
     public static final String CRITERIA_NEGATION_WRAPPER = "com.blazebit.persistence.criteria_negation_wrapper";
 
     /**
-     * If set to true, values passed to the JPA {@link javax.persistence.criteria.CriteriaBuilder} API are rendered as parameters,
+     * If set to true, values passed to the JPA {@link jakarta.persistence.criteria.CriteriaBuilder} API are rendered as parameters,
      * otherwise values are rendered as literals.
      * Valid values for this property are <code>true</code> and <code>false</code>.
      * Default is <code>true</code>.
diff --git a/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilder.java b/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilder.java
index 2b78b36848..133475f5c0 100644
--- a/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 
 /**
  * A builder for criteria queries. This is the entry point for building queries.
diff --git a/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilderFactory.java b/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilderFactory.java
index 56292e1ce8..dc7f3d7cca 100644
--- a/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilderFactory.java
+++ b/core/api/src/main/java/com/blazebit/persistence/CriteriaBuilderFactory.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.spi.JpqlFunction;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Map;
 
 /**
@@ -41,7 +41,7 @@ public interface CriteriaBuilderFactory extends ServiceProvider, ConfigurationSo
     public <T> StartOngoingSetOperationCriteriaBuilder<T, LeafOngoingFinalSetOperationCriteriaBuilder<T>> startSet(EntityManager entityManager, Class<T> resultClass);
 
     /**
-     * Like {@link CriteriaBuilderFactory#create(javax.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#create(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the result class returns.
      *
      * @param entityManager The entity manager to use for the criteria builder
@@ -65,7 +65,7 @@ public interface CriteriaBuilderFactory extends ServiceProvider, ConfigurationSo
     public <T> CriteriaBuilder<T> create(EntityManager entityManager, Class<T> resultClass, String alias);
 
     /**
-     * Like {@link CriteriaBuilderFactory#delete(javax.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#delete(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the delete class returns.
      *
      * @param entityManager The entity manager to use for the delete criteria builder
@@ -89,7 +89,7 @@ public interface CriteriaBuilderFactory extends ServiceProvider, ConfigurationSo
     public <T> DeleteCriteriaBuilder<T> delete(EntityManager entityManager, Class<T> deleteClass, String alias);
 
     /**
-     * Like {@link CriteriaBuilderFactory#deleteCollection(javax.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#deleteCollection(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the delete owner class returns.
      *
      * @param entityManager The entity manager to use for the delete criteria builder
@@ -116,7 +116,7 @@ public interface CriteriaBuilderFactory extends ServiceProvider, ConfigurationSo
     public <T> DeleteCriteriaBuilder<T> deleteCollection(EntityManager entityManager, Class<T> deleteOwnerClass, String alias, String collectionName);
 
     /**
-     * Like {@link CriteriaBuilderFactory#update(javax.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#update(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the update class returns.
      *
      * @param entityManager The entity manager to use for the update criteria builder
@@ -140,7 +140,7 @@ public interface CriteriaBuilderFactory extends ServiceProvider, ConfigurationSo
     public <T> UpdateCriteriaBuilder<T> update(EntityManager entityManager, Class<T> updateClass, String alias);
 
     /**
-     * Like {@link CriteriaBuilderFactory#updateCollection(javax.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#updateCollection(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the delete owner class returns.
      *
      * @param entityManager The entity manager to use for the update criteria builder
diff --git a/core/api/src/main/java/com/blazebit/persistence/DefaultPackageOpener.java b/core/api/src/main/java/com/blazebit/persistence/DefaultPackageOpener.java
index 69101cd343..bfdd3c644a 100644
--- a/core/api/src/main/java/com/blazebit/persistence/DefaultPackageOpener.java
+++ b/core/api/src/main/java/com/blazebit/persistence/DefaultPackageOpener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.spi.PackageOpener;
 
 /**
- * A no-op package opener for pre-Java 9.
+ * A package opener that works with Java 9 modules.
  *
  * @author Christian Beikov
  * @since 1.2.0
@@ -22,5 +22,9 @@ private DefaultPackageOpener() {
 
     @Override
     public void openPackageIfNeeded(Class<?> targetClass, String targetPackage, Class<?> implementationClass) {
+        Module targetModule = targetClass.getModule();
+        if (!targetModule.isOpen(targetPackage, implementationClass.getModule())) {
+            targetModule.addOpens(targetPackage, implementationClass.getModule());
+        }
     }
 }
diff --git a/core/api/src/main/java/com/blazebit/persistence/Executable.java b/core/api/src/main/java/com/blazebit/persistence/Executable.java
index 48d5a6f116..e397ac1302 100644
--- a/core/api/src/main/java/com/blazebit/persistence/Executable.java
+++ b/core/api/src/main/java/com/blazebit/persistence/Executable.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  * A base interface for executable query builders.
diff --git a/core/api/src/main/java/com/blazebit/persistence/From.java b/core/api/src/main/java/com/blazebit/persistence/From.java
index 1f2238f596..04542cf0a4 100644
--- a/core/api/src/main/java/com/blazebit/persistence/From.java
+++ b/core/api/src/main/java/com/blazebit/persistence/From.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * CAREFUL, this is an experimental API and will change!
diff --git a/core/api/src/main/java/com/blazebit/persistence/FromBaseBuilder.java b/core/api/src/main/java/com/blazebit/persistence/FromBaseBuilder.java
index 581423e96f..9491b9f5c9 100644
--- a/core/api/src/main/java/com/blazebit/persistence/FromBaseBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/FromBaseBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Collection;
 
 /**
@@ -98,7 +98,7 @@ public interface FromBaseBuilder<X extends FromBaseBuilder<X>> {
      * This introduces a parameter named like the given alias.
      *
      * To set the values invoke {@link CommonQueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param valueClass The class of the basic or managed type for which to create a VALUES clause
      * @param alias The alias for the entity
@@ -113,7 +113,7 @@ public interface FromBaseBuilder<X extends FromBaseBuilder<X>> {
      * This introduces a parameter named like the given alias.
      *
      * To set the values invoke {@link CommonQueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param entityBaseClass The entity class on which the attribute is located
      * @param attributeName The attribute name within the entity class which to use for determining the values type
@@ -131,7 +131,7 @@ public interface FromBaseBuilder<X extends FromBaseBuilder<X>> {
      * In contrast to {@link FromBaseBuilder#fromValues(Class, String, int)} this will only bind the id attribute.
      *
      * To set the values invoke {@link CommonQueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param valueClass The class of the identifiable type for which to create a VALUES clause
      * @param alias The alias for the entity
@@ -148,7 +148,7 @@ public interface FromBaseBuilder<X extends FromBaseBuilder<X>> {
      * In contrast to {@link FromBaseBuilder#fromValues(Class, String, int)} this will only bind the identifier attribute.
      *
      * To set the values invoke {@link CommonQueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param valueClass The class of the identifiable type for which to create a VALUES clause
      * @param identifierAttribute The attribute of the entity type to consider as identifier attribute
diff --git a/core/api/src/main/java/com/blazebit/persistence/FromBuilder.java b/core/api/src/main/java/com/blazebit/persistence/FromBuilder.java
index c9765895a6..d0c171a5bd 100644
--- a/core/api/src/main/java/com/blazebit/persistence/FromBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/FromBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Collection;
 import java.util.Set;
 
@@ -189,7 +189,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> joinOn(String base, Class<?> entityClass, String alias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinOn(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -237,7 +237,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> joinOnSubquery(String base, Class<?> entityClass, String alias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -317,7 +317,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z joinOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -344,7 +344,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z joinOnEntitySubquery(String base, EntityType<?> entityType, String alias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -397,7 +397,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> joinLateralOnSubquery(String base, Class<?> entityClass, String alias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -450,7 +450,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z joinLateralOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -528,7 +528,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<X> joinLateralSubquery(String base, Class<?> entityClass, String alias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -581,7 +581,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<X, ? extends Z>> Z joinLateralEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias, JoinType type);
 
     /**
-     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * the query root assumed as base.
      *
      * @param entityType The entity type to join
@@ -698,7 +698,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> innerJoinOn(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -709,7 +709,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> innerJoinOn(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -744,7 +744,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> innerJoinOnSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -755,7 +755,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> innerJoinOnSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -792,7 +792,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinOnEntitySubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -804,7 +804,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinOnEntitySubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -844,7 +844,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -857,7 +857,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinOnEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -894,7 +894,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> innerJoinLateralOnSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -905,7 +905,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> innerJoinLateralOnSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -944,7 +944,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinLateralOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -957,7 +957,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z innerJoinLateralOnEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -1019,7 +1019,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<X> innerJoinLateralSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -1030,7 +1030,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<X> innerJoinLateralSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -1069,7 +1069,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<X, ? extends Z>> Z innerJoinLateralEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param entityType The entity type to join
@@ -1082,7 +1082,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<X, ? extends Z>> Z innerJoinLateralEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#INNER}.
      *
      * @param base The base node on which to join
@@ -1184,7 +1184,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> leftJoinOn(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1195,7 +1195,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> leftJoinOn(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1230,7 +1230,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> leftJoinOnSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1241,7 +1241,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> leftJoinOnSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1278,7 +1278,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinOnEntitySubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1290,7 +1290,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinOnEntitySubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1330,7 +1330,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1343,7 +1343,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinOnEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1380,7 +1380,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> leftJoinLateralOnSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1391,7 +1391,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> leftJoinLateralOnSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1430,7 +1430,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinLateralOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1443,7 +1443,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z leftJoinLateralOnEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1505,7 +1505,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<X> leftJoinLateralSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1516,7 +1516,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<X> leftJoinLateralSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1555,7 +1555,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<X, ? extends Z>> Z leftJoinLateralEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param entityType The entity type to join
@@ -1568,7 +1568,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<X, ? extends Z>> Z leftJoinLateralEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinLateralEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#LEFT}.
      *
      * @param base The base node on which to join
@@ -1670,7 +1670,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> rightJoinOn(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param entityType The entity type to join
@@ -1681,7 +1681,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public JoinOnBuilder<X> rightJoinOn(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOn(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOn(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param base The base node on which to join
@@ -1716,7 +1716,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> rightJoinOnSubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param entityType The entity type to join
@@ -1727,7 +1727,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public FullSelectCTECriteriaBuilder<JoinOnBuilder<X>> rightJoinOnSubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnSubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param base The base node on which to join
@@ -1764,7 +1764,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z rightJoinOnEntitySubquery(String base, Class<?> entityClass, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param entityType The entity type to join
@@ -1776,7 +1776,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z rightJoinOnEntitySubquery(EntityType<?> entityType, String alias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param base The base node on which to join
@@ -1816,7 +1816,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z rightJoinOnEntitySubquery(String base, Class<?> entityClass, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param entityType The entity type to join
@@ -1829,7 +1829,7 @@ public interface FromBuilder<X extends FromBuilder<X>> extends FromBaseBuilder<X
     public <Z extends BaseFromQueryBuilder<JoinOnBuilder<X>, ? extends Z>> Z rightJoinOnEntitySubquery(EntityType<?> entityType, String alias, String subqueryAlias);
 
     /**
-     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, javax.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
+     * Like {@link FromBuilder#joinOnEntitySubquery(java.lang.String, jakarta.persistence.metamodel.EntityType, java.lang.String, com.blazebit.persistence.JoinType) } but with
      * {@link JoinType#RIGHT}.
      *
      * @param base The base node on which to join
diff --git a/core/api/src/main/java/com/blazebit/persistence/FullQueryBuilder.java b/core/api/src/main/java/com/blazebit/persistence/FullQueryBuilder.java
index fb45b9bc1a..47f322e3c1 100644
--- a/core/api/src/main/java/com/blazebit/persistence/FullQueryBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/FullQueryBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.lang.reflect.Constructor;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/ModificationCriteriaBuilder.java b/core/api/src/main/java/com/blazebit/persistence/ModificationCriteriaBuilder.java
index acf1644144..b93218bc9b 100644
--- a/core/api/src/main/java/com/blazebit/persistence/ModificationCriteriaBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/ModificationCriteriaBuilder.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 
 /**
  * A builder for modification queries.
diff --git a/core/api/src/main/java/com/blazebit/persistence/PaginatedCriteriaBuilder.java b/core/api/src/main/java/com/blazebit/persistence/PaginatedCriteriaBuilder.java
index 0ec887ea24..cbdf092cb5 100644
--- a/core/api/src/main/java/com/blazebit/persistence/PaginatedCriteriaBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/PaginatedCriteriaBuilder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 
 /**
  * A builder for paginated criteria queries.
diff --git a/core/api/src/main/java/com/blazebit/persistence/PaginatedTypedQuery.java b/core/api/src/main/java/com/blazebit/persistence/PaginatedTypedQuery.java
index f3f4cb2e0d..eda96bafbf 100644
--- a/core/api/src/main/java/com/blazebit/persistence/PaginatedTypedQuery.java
+++ b/core/api/src/main/java/com/blazebit/persistence/PaginatedTypedQuery.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/ParameterHolder.java b/core/api/src/main/java/com/blazebit/persistence/ParameterHolder.java
index edeb109da9..0475751dc1 100644
--- a/core/api/src/main/java/com/blazebit/persistence/ParameterHolder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/ParameterHolder.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Set;
diff --git a/core/api/src/main/java/com/blazebit/persistence/Path.java b/core/api/src/main/java/com/blazebit/persistence/Path.java
index eccda37a17..5cf61d7e02 100644
--- a/core/api/src/main/java/com/blazebit/persistence/Path.java
+++ b/core/api/src/main/java/com/blazebit/persistence/Path.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * CAREFUL, this is an experimental API and will change!
diff --git a/core/api/src/main/java/com/blazebit/persistence/QueryBuilder.java b/core/api/src/main/java/com/blazebit/persistence/QueryBuilder.java
index 69c2edf820..5d061646be 100644
--- a/core/api/src/main/java/com/blazebit/persistence/QueryBuilder.java
+++ b/core/api/src/main/java/com/blazebit/persistence/QueryBuilder.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence;
 
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A base interface for builders that support normal query functionality.
diff --git a/core/api/src/main/java/com/blazebit/persistence/Queryable.java b/core/api/src/main/java/com/blazebit/persistence/Queryable.java
index e7d44c384b..cab51e8c45 100644
--- a/core/api/src/main/java/com/blazebit/persistence/Queryable.java
+++ b/core/api/src/main/java/com/blazebit/persistence/Queryable.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/core/api/src/main/java/com/blazebit/persistence/ReturningModificationCriteriaBuilderFactory.java b/core/api/src/main/java/com/blazebit/persistence/ReturningModificationCriteriaBuilderFactory.java
index 26f4467e66..45819ee973 100644
--- a/core/api/src/main/java/com/blazebit/persistence/ReturningModificationCriteriaBuilderFactory.java
+++ b/core/api/src/main/java/com/blazebit/persistence/ReturningModificationCriteriaBuilderFactory.java
@@ -84,7 +84,7 @@ public interface ReturningModificationCriteriaBuilderFactory<X> {
     public <T> ReturningUpdateCriteriaBuilder<T, X> update(Class<T> updateClass, String alias);
 
     /**
-     * Like {@link CriteriaBuilderFactory#updateCollection(javax.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
+     * Like {@link CriteriaBuilderFactory#updateCollection(jakarta.persistence.EntityManager, java.lang.Class, java.lang.String, java.lang.String)} but with the alias
      * equivalent to the camel cased result of what {@link Class#getSimpleName()} of the delete owner class returns.
      *
      * @param updateOwnerClass The entity class owning the collection for the update criteria
diff --git a/core/api/src/main/java/com/blazebit/persistence/SubqueryInitiator.java b/core/api/src/main/java/com/blazebit/persistence/SubqueryInitiator.java
index 25ea06f3eb..e16e40273b 100644
--- a/core/api/src/main/java/com/blazebit/persistence/SubqueryInitiator.java
+++ b/core/api/src/main/java/com/blazebit/persistence/SubqueryInitiator.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Collection;
 
 /**
@@ -145,7 +145,7 @@ public interface SubqueryInitiator<T> extends FromBaseBuilder<SubqueryBuilder<T>
      * This introduces a parameter named like the given alias.
      *
      * To set the values invoke {@link SubqueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param valueClass The class of the basic or managed type for which to create a VALUES clause
      * @param alias The alias for the entity
@@ -161,7 +161,7 @@ public interface SubqueryInitiator<T> extends FromBaseBuilder<SubqueryBuilder<T>
      * This introduces a parameter named like the given alias.
      *
      * To set the values invoke {@link CommonQueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param entityBaseClass The entity class on which the attribute is located
      * @param attributeName The attribute name within the entity class which to use for determining the values type
@@ -180,7 +180,7 @@ public interface SubqueryInitiator<T> extends FromBaseBuilder<SubqueryBuilder<T>
      * In contrast to {@link SubqueryInitiator#fromValues(Class, String, int)} this will only bind the id attribute.
      *
      * To set the values invoke {@link SubqueryBuilder#setParameter(String, Object)}
-     * or {@link javax.persistence.Query#setParameter(String, Object)} with the alias and a collection.
+     * or {@link jakarta.persistence.Query#setParameter(String, Object)} with the alias and a collection.
      *
      * @param valueClass The class of the identifiable type for which to create a VALUES clause
      * @param alias The alias for the entity
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/AttributePath.java b/core/api/src/main/java/com/blazebit/persistence/spi/AttributePath.java
index 116946f276..2dfabc700c 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/AttributePath.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/AttributePath.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
 import java.util.List;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfiguration.java b/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfiguration.java
index ab9540b4e3..6a3f99211b 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfiguration.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfiguration.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.CriteriaBuilderFactory;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfigurationContributor.java b/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfigurationContributor.java
index 94c743eb48..aeccff7a85 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfigurationContributor.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/CriteriaBuilderConfigurationContributor.java
@@ -8,7 +8,7 @@
 /**
  * A bootstrap process hook for contributing settings to the {@link CriteriaBuilderConfiguration}.
  * {@code CriteriaBuilderConfigurationContributor} instances may be annotated with {@link Priority}
- * (or {@code javax.annotation.Priority}) to influence the order in which they are registered.
+ * (or {@code jakarta.annotation.Priority}) to influence the order in which they are registered.
  * The range 0-500 is reserved for internal uses. 500 - 1000 is reserved for libraries and 1000+
  * is for user provided contributors.
  *
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/CteQueryWrapper.java b/core/api/src/main/java/com/blazebit/persistence/spi/CteQueryWrapper.java
index 8843b504c3..74d76c8c6b 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/CteQueryWrapper.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/CteQueryWrapper.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/DbmsDialect.java b/core/api/src/main/java/com/blazebit/persistence/spi/DbmsDialect.java
index 9c0007722a..63aa0019bc 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/DbmsDialect.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/DbmsDialect.java
@@ -39,11 +39,13 @@ public interface DbmsDialect {
     public boolean supportsNonRecursiveWithClause();
 
     /**
-     * Returns true if the dbms supports the with clause head for aliasing, false otherwise.
+     * Returns true if the dbms supports pagination in the with clause directly or needs to alias selection items.
+     * This is only needed for Hibernate ORM which uses Oracles {@code fetch first} syntax,
+     * since that is implemented through a query rewrite that needs aliases.
      *
-     * @return Whether the with clause head is supported by the dbms
+     * @return Whether pagination is supported in the with clause head by the dbms
      */
-    public boolean supportsWithClauseHead();
+    public boolean supportsPaginationInWithClause();
 
     /**
      * Returns the SQL representation for the normal or recursive with clause. 
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/EntityManagerFactoryIntegrator.java b/core/api/src/main/java/com/blazebit/persistence/spi/EntityManagerFactoryIntegrator.java
index bf9674528f..60da45e476 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/EntityManagerFactoryIntegrator.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/EntityManagerFactoryIntegrator.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.Map;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedAttribute.java b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedAttribute.java
index 2945aef212..76324e5a5b 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedAttribute.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedAttribute.java
@@ -7,14 +7,14 @@
 
 import com.blazebit.persistence.JoinType;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * This is a wrapper around the JPA {@link javax.persistence.metamodel.Attribute} that allows additionally efficient access to properties of the metamodel.
+ * This is a wrapper around the JPA {@link jakarta.persistence.metamodel.Attribute} that allows additionally efficient access to properties of the metamodel.
  *
  * @param <X> The Java type represented by the managed type owning the attribute
  * @param <Y> The Java element type of the attribute
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedManagedType.java b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedManagedType.java
index 0c709d8646..e81a9f9e9c 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedManagedType.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedManagedType.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * This is a wrapper around the JPA {@link javax.persistence.metamodel.ManagedType} that allows additionally efficient access to properties of the metamodel.
+ * This is a wrapper around the JPA {@link jakarta.persistence.metamodel.ManagedType} that allows additionally efficient access to properties of the metamodel.
  *
  * @param <X> The Java type represented by this managed type
  * @author Christian Beikov
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedQuerySupport.java b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedQuerySupport.java
index 9699dfc5ae..e7cbd9efb4 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedQuerySupport.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/ExtendedQuerySupport.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.ReturningResult;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/JpaMetamodelAccessor.java b/core/api/src/main/java/com/blazebit/persistence/spi/JpaMetamodelAccessor.java
index 6d9e3418a0..6f196f067e 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/JpaMetamodelAccessor.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/JpaMetamodelAccessor.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Metamodel;
 
 /**
  * @author Jan-Willem Gmelig Meyling
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/JpaProvider.java b/core/api/src/main/java/com/blazebit/persistence/spi/JpaProvider.java
index fc57738b04..3eb50dd462 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/JpaProvider.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/JpaProvider.java
@@ -7,10 +7,10 @@
 
 import com.blazebit.persistence.JoinType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.List;
 import java.util.Map;
 
@@ -511,15 +511,6 @@ public interface JpaProvider {
      */
     public boolean supportsTransientEntityAsParameter();
 
-    /**
-     * Indicates if the provider needs associations in the ON clause to use their id.
-     * If needed, an expression like <code>alias.association</code> in the ON clause is rewritten to
-     * <code>alias.association.id</code>.
-     *
-     * @return true if required, else false
-     */
-    public boolean needsAssociationToIdRewriteInOnClause();
-
     /**
      * Indicates if the provider needs associations in the ON clause to use their id.
      * If needed, an expression like <code>alias.association</code> in the ON clause is rewritten to
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/JpaProviderFactory.java b/core/api/src/main/java/com/blazebit/persistence/spi/JpaProviderFactory.java
index dc1830ace9..f50ce20408 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/JpaProviderFactory.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/JpaProviderFactory.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.spi;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A service provider factory to create {@link JpaProvider} instances.
diff --git a/core/api/src/main/java/com/blazebit/persistence/spi/JpqlFunction.java b/core/api/src/main/java/com/blazebit/persistence/spi/JpqlFunction.java
index ca850fbd37..cc448bed72 100644
--- a/core/api/src/main/java/com/blazebit/persistence/spi/JpqlFunction.java
+++ b/core/api/src/main/java/com/blazebit/persistence/spi/JpqlFunction.java
@@ -12,7 +12,7 @@
  *
  * @author Christian Beikov
  * @since 1.0.0
- * @see EntityManagerFactoryIntegrator#registerFunctions(javax.persistence.EntityManagerFactory, java.util.Map)
+ * @see EntityManagerFactoryIntegrator#registerFunctions(jakarta.persistence.EntityManagerFactory, java.util.Map)
  */
 public interface JpqlFunction {
 
diff --git a/core/api/src/main/java/module-info.java b/core/api/src/main/java/module-info.java
new file mode 100644
index 0000000000..619c50a2c9
--- /dev/null
+++ b/core/api/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.core {
+	requires transitive java.sql;
+	requires transitive jakarta.persistence;
+	exports com.blazebit.persistence;
+	exports com.blazebit.persistence.spi;
+	exports com.blazebit.persistence.internal;
+	uses com.blazebit.persistence.spi.CriteriaBuilderConfigurationProvider;
+}
\ No newline at end of file
diff --git a/core/api/src/main/java9/com/blazebit/persistence/DefaultPackageOpener.java b/core/api/src/main/java9/com/blazebit/persistence/DefaultPackageOpener.java
deleted file mode 100644
index bfdd3c644a..0000000000
--- a/core/api/src/main/java9/com/blazebit/persistence/DefaultPackageOpener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence;
-
-import com.blazebit.persistence.spi.PackageOpener;
-
-/**
- * A package opener that works with Java 9 modules.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-class DefaultPackageOpener implements PackageOpener {
-
-    static final PackageOpener INSTANCE = new DefaultPackageOpener();
-
-    private DefaultPackageOpener() {
-    }
-
-    @Override
-    public void openPackageIfNeeded(Class<?> targetClass, String targetPackage, Class<?> implementationClass) {
-        Module targetModule = targetClass.getModule();
-        if (!targetModule.isOpen(targetPackage, implementationClass.getModule())) {
-            targetModule.addOpens(targetPackage, implementationClass.getModule());
-        }
-    }
-}
diff --git a/core/api/src/main/resources/META-INF/MANIFEST.MF b/core/api/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e714012cef..0000000000
--- a/core/api/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Multi-Release: true
diff --git a/core/impl-jakarta/pom.xml b/core/impl-jakarta/pom.xml
deleted file mode 100644
index cd6149d678..0000000000
--- a/core/impl-jakarta/pom.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-core-impl:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-impl:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-impl:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/impl-jar/pom.xml b/core/impl-jar/pom.xml
deleted file mode 100644
index 7cc7d237ee..0000000000
--- a/core/impl-jar/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-impl-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-core-impl</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-core-impl</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/impl/pom.xml b/core/impl/pom.xml
index a4c422eb14..8df35c330e 100644
--- a/core/impl/pom.xml
+++ b/core/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,6 @@
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
 
-        <!-- JPA 2.2 API for getResultStream signature -->
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
@@ -59,215 +58,6 @@
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.core.parser;
-                                        exports com.blazebit.persistence.impl;
-                                        exports com.blazebit.persistence.impl.builder.expression;
-                                        exports com.blazebit.persistence.impl.builder.object;
-                                        exports com.blazebit.persistence.impl.builder.predicate;
-                                        exports com.blazebit.persistence.impl.dialect;
-                                        exports com.blazebit.persistence.impl.function;
-                                        exports com.blazebit.persistence.impl.function.alias;
-                                        exports com.blazebit.persistence.impl.function.base64;
-                                        exports com.blazebit.persistence.impl.function.cast;
-                                        exports com.blazebit.persistence.impl.function.chr;
-                                        exports com.blazebit.persistence.impl.function.colldml;
-                                        exports com.blazebit.persistence.impl.function.coltrunc;
-                                        exports com.blazebit.persistence.impl.function.concat;
-                                        exports com.blazebit.persistence.impl.function.count;
-                                        exports com.blazebit.persistence.impl.function.countwrapper;
-                                        exports com.blazebit.persistence.impl.function.dateadd;
-                                        exports com.blazebit.persistence.impl.function.dateadd.day;
-                                        exports com.blazebit.persistence.impl.function.dateadd.hour;
-                                        exports com.blazebit.persistence.impl.function.dateadd.microseconds;
-                                        exports com.blazebit.persistence.impl.function.dateadd.milliseconds;
-                                        exports com.blazebit.persistence.impl.function.dateadd.minute;
-                                        exports com.blazebit.persistence.impl.function.dateadd.month;
-                                        exports com.blazebit.persistence.impl.function.dateadd.quarter;
-                                        exports com.blazebit.persistence.impl.function.dateadd.second;
-                                        exports com.blazebit.persistence.impl.function.dateadd.week;
-                                        exports com.blazebit.persistence.impl.function.dateadd.year;
-                                        exports com.blazebit.persistence.impl.function.datediff;
-                                        exports com.blazebit.persistence.impl.function.datediff.day;
-                                        exports com.blazebit.persistence.impl.function.datediff.hour;
-                                        exports com.blazebit.persistence.impl.function.datediff.microsecond;
-                                        exports com.blazebit.persistence.impl.function.datediff.millisecond;
-                                        exports com.blazebit.persistence.impl.function.datediff.minute;
-                                        exports com.blazebit.persistence.impl.function.datediff.month;
-                                        exports com.blazebit.persistence.impl.function.datediff.quarter;
-                                        exports com.blazebit.persistence.impl.function.datediff.second;
-                                        exports com.blazebit.persistence.impl.function.datediff.week;
-                                        exports com.blazebit.persistence.impl.function.datediff.year;
-                                        exports com.blazebit.persistence.impl.function.datetime.day;
-                                        exports com.blazebit.persistence.impl.function.datetime.dayofweek;
-                                        exports com.blazebit.persistence.impl.function.datetime.dayofyear;
-                                        exports com.blazebit.persistence.impl.function.datetime.epoch;
-                                        exports com.blazebit.persistence.impl.function.datetime.epochday;
-                                        exports com.blazebit.persistence.impl.function.datetime.epochmicro;
-                                        exports com.blazebit.persistence.impl.function.datetime.epochmilli;
-                                        exports com.blazebit.persistence.impl.function.datetime.hour;
-                                        exports com.blazebit.persistence.impl.function.datetime.isodayofweek;
-                                        exports com.blazebit.persistence.impl.function.datetime.isoweek;
-                                        exports com.blazebit.persistence.impl.function.datetime.microsecond;
-                                        exports com.blazebit.persistence.impl.function.datetime.millisecond;
-                                        exports com.blazebit.persistence.impl.function.datetime.minute;
-                                        exports com.blazebit.persistence.impl.function.datetime.month;
-                                        exports com.blazebit.persistence.impl.function.datetime.quarter;
-                                        exports com.blazebit.persistence.impl.function.datetime.second;
-                                        exports com.blazebit.persistence.impl.function.datetime.week;
-                                        exports com.blazebit.persistence.impl.function.datetime.year;
-                                        exports com.blazebit.persistence.impl.function.datetime.yearofweek;
-                                        exports com.blazebit.persistence.impl.function.datetime.yearweek;
-                                        exports com.blazebit.persistence.impl.function.entity;
-                                        exports com.blazebit.persistence.impl.function.every;
-                                        exports com.blazebit.persistence.impl.function.exist;
-                                        exports com.blazebit.persistence.impl.function.greatest;
-                                        exports com.blazebit.persistence.impl.function.groupconcat;
-                                        exports com.blazebit.persistence.impl.function.grouping;
-                                        exports com.blazebit.persistence.impl.function.groupingsets;
-                                        exports com.blazebit.persistence.impl.function.jsonget;
-                                        exports com.blazebit.persistence.impl.function.jsonset;
-                                        exports com.blazebit.persistence.impl.function.least;
-                                        exports com.blazebit.persistence.impl.function.limit;
-                                        exports com.blazebit.persistence.impl.function.literal;
-                                        exports com.blazebit.persistence.impl.function.nullfn;
-                                        exports com.blazebit.persistence.impl.function.nullsubquery;
-                                        exports com.blazebit.persistence.impl.function.oragg;
-                                        exports com.blazebit.persistence.impl.function.pageposition;
-                                        exports com.blazebit.persistence.impl.function.param;
-                                        exports com.blazebit.persistence.impl.function.querywrapper;
-                                        exports com.blazebit.persistence.impl.function.repeat;
-                                        exports com.blazebit.persistence.impl.function.replace;
-                                        exports com.blazebit.persistence.impl.function.rowvalue;
-                                        exports com.blazebit.persistence.impl.function.set;
-                                        exports com.blazebit.persistence.impl.function.stringjsonagg;
-                                        exports com.blazebit.persistence.impl.function.stringxmlagg;
-                                        exports com.blazebit.persistence.impl.function.subquery;
-                                        exports com.blazebit.persistence.impl.function.tomultiset;
-                                        exports com.blazebit.persistence.impl.function.tostringjson;
-                                        exports com.blazebit.persistence.impl.function.tostringxml;
-                                        exports com.blazebit.persistence.impl.function.treat;
-                                        exports com.blazebit.persistence.impl.function.trunc;
-                                        exports com.blazebit.persistence.impl.function.trunc.day;
-                                        exports com.blazebit.persistence.impl.function.trunc.hour;
-                                        exports com.blazebit.persistence.impl.function.trunc.microseconds;
-                                        exports com.blazebit.persistence.impl.function.trunc.milliseconds;
-                                        exports com.blazebit.persistence.impl.function.trunc.minute;
-                                        exports com.blazebit.persistence.impl.function.trunc.month;
-                                        exports com.blazebit.persistence.impl.function.trunc.quarter;
-                                        exports com.blazebit.persistence.impl.function.trunc.second;
-                                        exports com.blazebit.persistence.impl.function.trunc.week;
-                                        exports com.blazebit.persistence.impl.function.trunc.year;
-                                        exports com.blazebit.persistence.impl.function.window;
-                                        exports com.blazebit.persistence.impl.function.window.avg;
-                                        exports com.blazebit.persistence.impl.function.window.count;
-                                        exports com.blazebit.persistence.impl.function.window.cumedist;
-                                        exports com.blazebit.persistence.impl.function.window.denserank;
-                                        exports com.blazebit.persistence.impl.function.window.every;
-                                        exports com.blazebit.persistence.impl.function.window.first;
-                                        exports com.blazebit.persistence.impl.function.window.groupconcat;
-                                        exports com.blazebit.persistence.impl.function.window.lag;
-                                        exports com.blazebit.persistence.impl.function.window.last;
-                                        exports com.blazebit.persistence.impl.function.window.lead;
-                                        exports com.blazebit.persistence.impl.function.window.max;
-                                        exports com.blazebit.persistence.impl.function.window.min;
-                                        exports com.blazebit.persistence.impl.function.window.nth;
-                                        exports com.blazebit.persistence.impl.function.window.ntile;
-                                        exports com.blazebit.persistence.impl.function.window.oragg;
-                                        exports com.blazebit.persistence.impl.function.window.percentrank;
-                                        exports com.blazebit.persistence.impl.function.window.rank;
-                                        exports com.blazebit.persistence.impl.function.window.row;
-                                        exports com.blazebit.persistence.impl.function.window.sum;
-                                        exports com.blazebit.persistence.impl.keyset;
-                                        exports com.blazebit.persistence.impl.plan;
-                                        exports com.blazebit.persistence.impl.query;
-                                        exports com.blazebit.persistence.impl.transform;
-                                        exports com.blazebit.persistence.impl.util;
-                                        opens com.blazebit.persistence.impl.function.entity to org.hibernate.orm.core, eclipselink;
-                                        uses com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-                                        uses com.blazebit.persistence.spi.ExtendedQuerySupport;
-                                        uses com.blazebit.persistence.spi.CriteriaBuilderConfigurationContributor;
-                                        provides com.blazebit.persistence.spi.CriteriaBuilderConfigurationProvider with com.blazebit.persistence.impl.CriteriaBuilderConfigurationProviderImpl;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>java9</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-            </activation>
-            <properties>
-                <jdkSpecificSourceDirectory>src/main/java9</jdkSpecificSourceDirectory>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-java9</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Multi-Release>true</Multi-Release>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
index df1d9fb073..82e946ba74 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCTECriteriaBuilder.java
@@ -18,8 +18,8 @@
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
index 6e50eab9c2..5344107781 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java
@@ -102,21 +102,21 @@
 import com.blazebit.persistence.spi.SetOperationType;
 import com.blazebit.persistence.spi.ValuesStrategy;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -3452,39 +3452,28 @@ protected List<CTENode> getCteNodes(boolean isSubquery) {
                 String cteName = cteInfo.cteType.getName();
                 final List<String> columnNames = cteInfo.columnNames;
                 String head;
-                String[] aliases;
-
-                if (mainQuery.dbmsDialect.supportsWithClauseHead()) {
-                    sb.setLength(0);
-                    sb.append(cteName);
-                    sb.append('(');
 
-                    for (int i = 0; i < columnNames.size(); i++) {
-                        String column = columnNames.get(i);
-                        if (i != 0) {
-                            sb.append(", ");
-                        }
+                sb.setLength(0);
+                sb.append(cteName);
+                sb.append('(');
 
-                        sb.append(column);
+                for (int i = 0; i < columnNames.size(); i++) {
+                    String column = columnNames.get(i);
+                    if (i != 0) {
+                        sb.append(", ");
                     }
 
-                    sb.append(')');
-                    head = sb.toString();
-                    aliases = null;
-                } else {
-                    sb.setLength(0);
-                    sb.append(cteName);
-                    List<String> list = new ArrayList<>(columnNames.size());
+                    sb.append(column);
+                }
 
-                    for (int i = 0; i < columnNames.size(); i++) {
-                        String[] columns = mainQuery.metamodel.getManagedType(ExtendedManagedType.class, cteInfo.cteType.getJavaType()).getAttribute(columnNames.get(i)).getColumnNames();
-                        for (String column : columns) {
-                            list.add(column);
-                        }
-                    }
+                sb.append(')');
+                head = sb.toString();
 
-                    head = sb.toString();
-                    aliases = list.toArray(new String[list.size()]);
+                String[] aliases;
+                if (mainQuery.dbmsDialect.supportsPaginationInWithClause() || !cteInfo.nonRecursiveCriteriaBuilder.hasLimit()) {
+                    aliases = null;
+                } else {
+                    aliases = columnNames.toArray(new String[0]);
                 }
 
                 String nonRecursiveWithClauseSuffix = null;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
index 4fbfbc5c44..6be5166da2 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractDeleteCollectionCriteriaBuilder.java
@@ -27,13 +27,13 @@
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 import com.blazebit.persistence.spi.JoinTable;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractFullQueryBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractFullQueryBuilder.java
index 12d030e1c4..f3e75ecb7e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractFullQueryBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractFullQueryBuilder.java
@@ -45,12 +45,12 @@
 import com.blazebit.persistence.spi.AttributeAccessor;
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
index 79103fd9f1..31b4646472 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractInsertCollectionCriteriaBuilder.java
@@ -25,14 +25,14 @@
 import com.blazebit.persistence.spi.JoinTable;
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
index 7886726f29..27166ab1e3 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractModificationCriteriaBuilder.java
@@ -33,12 +33,12 @@
 import com.blazebit.persistence.spi.JoinTable;
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 
-import javax.persistence.Query;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractQueryBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractQueryBuilder.java
index 6e3fcae8ce..d056c6cd7d 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractQueryBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractQueryBuilder.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 
 import com.blazebit.persistence.FullQueryBuilder;
 import com.blazebit.persistence.Queryable;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
index ce9a542190..c4e80c8a5a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AbstractUpdateCollectionCriteriaBuilder.java
@@ -27,16 +27,16 @@
 import com.blazebit.persistence.spi.JoinTable;
 import com.blazebit.persistence.spi.UpdateJoinStyle;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -305,7 +305,7 @@ protected void prepareAndCheck(JoinVisitor parentVisitor) {
         if (!needsCheck) {
             return;
         }
-        boolean enableElementCollectionIdCutoff = collectionAttribute.getJoinTable() != null && !mainQuery.jpaProvider.needsAssociationToIdRewriteInOnClause();
+        boolean enableElementCollectionIdCutoff = collectionAttribute.getJoinTable() != null;
         JpaUtils.expandBindings(setAttributeBindingMap, collectionColumnBindingMap, collectionAttributeEntries, ClauseType.SET, this, keyFunctionExpression, enableElementCollectionIdCutoff);
         super.prepareAndCheck(parentVisitor);
     }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationFromIdParameterTransformer.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationFromIdParameterTransformer.java
index 09337846a9..9017f850d9 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationFromIdParameterTransformer.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationFromIdParameterTransformer.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.Attribute;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationToIdParameterTransformer.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationToIdParameterTransformer.java
index 9f7c6f2633..41a2a7e952 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationToIdParameterTransformer.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AssociationToIdParameterTransformer.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/AttributeHolder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/AttributeHolder.java
index 24385fd33f..4fddb5968b 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/AttributeHolder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/AttributeHolder.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.impl;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Type;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseDeleteCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseDeleteCriteriaBuilderImpl.java
index afc93b4efe..bf3828ba53 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseDeleteCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseDeleteCriteriaBuilderImpl.java
@@ -24,8 +24,8 @@
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
index 346b1dd330..1811448d80 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationBuilderImpl.java
@@ -30,8 +30,8 @@
 import com.blazebit.persistence.spi.OrderByElement;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -442,6 +442,9 @@ protected TypedQuery<T> getTypedQuery(StringBuilder lateralSb, JoinNode lateralJ
 
     @Override
     protected boolean needsSqlReplacement(Set<JoinNode> keyRestrictedLeftJoins) {
+        if (isMainQuery && mainQuery.cteManager.hasCtes()) {
+            return true;
+        }
         if (setOperationManager.getStartQueryBuilder().needsSqlReplacement(setOperationManager.getStartQueryBuilder().getKeyRestrictedLeftJoins())) {
             return true;
         }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationSubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationSubqueryBuilderImpl.java
index c54f85ec90..982025fd42 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationSubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseFinalSetOperationSubqueryBuilderImpl.java
@@ -10,7 +10,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.BaseFinalSetOperationBuilder;
 import com.blazebit.persistence.BaseOngoingFinalSetOperationBuilder;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
index 826d635b53..259202f40e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseInsertCriteriaBuilderImpl.java
@@ -12,7 +12,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 import com.blazebit.persistence.BaseInsertCriteriaBuilder;
 import com.blazebit.persistence.ReturningBuilder;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseSubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseSubqueryBuilderImpl.java
index 8797b9a1bb..60ef008dbf 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseSubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseSubqueryBuilderImpl.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.spi.JpqlFunctionProcessor;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseUpdateCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseUpdateCriteriaBuilderImpl.java
index 974e6d83a0..8dfac5620a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/BaseUpdateCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/BaseUpdateCriteriaBuilderImpl.java
@@ -35,11 +35,11 @@
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 import com.blazebit.persistence.spi.UpdateJoinStyle;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CTEInfo.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CTEInfo.java
index 1f7658355f..59eeb35141 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CTEInfo.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CTEInfo.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.parser.expression.ExpressionCopyContext;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.List;
 import java.util.Map;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CTEManager.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CTEManager.java
index 4acf6dccb8..353ae5328a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CTEManager.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CTEManager.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionCopyContext;
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.IdentityHashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CachingJpaProvider.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CachingJpaProvider.java
index 2c1e9c0e54..b5055ab0cf 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CachingJpaProvider.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CachingJpaProvider.java
@@ -12,10 +12,10 @@
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.List;
 import java.util.Map;
 
@@ -333,11 +333,6 @@ public boolean supportsTransientEntityAsParameter() {
         return jpaProvider.supportsTransientEntityAsParameter();
     }
 
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return jpaProvider.needsAssociationToIdRewriteInOnClause();
-    }
-
     @Override
     public boolean needsBrokenAssociationToIdRewriteInOnClause() {
         return jpaProvider.needsBrokenAssociationToIdRewriteInOnClause();
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CallerChecker.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CallerChecker.java
index 1cfc708218..d1214d0199 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CallerChecker.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CallerChecker.java
@@ -5,6 +5,8 @@
 
 package com.blazebit.persistence.impl;
 
+import java.util.Set;
+
 /**
  * A contract that checks if the caller of our caller is trusted. On Java 9 this will actually check modules.
  *
@@ -17,6 +19,8 @@ private CallerChecker() {
     }
 
     public static boolean isCallerTrusted() {
-        return true;
+        return StackWalker.getInstance(Set.of(), 2).walk(stackFrames -> {
+            return stackFrames.limit(2).allMatch(s -> s.getClassName().startsWith("com.blazebit.persistence."));
+        });
     }
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CommonQueryBuilderAdapter.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CommonQueryBuilderAdapter.java
index 05e212cbc5..7bbd6ab17e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CommonQueryBuilderAdapter.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CommonQueryBuilderAdapter.java
@@ -10,9 +10,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.ParameterExpression;
 
 import com.blazebit.persistence.CommonQueryBuilder;
 import com.blazebit.persistence.CriteriaBuilderFactory;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ConstantifiedJoinNodeAttributeCollector.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ConstantifiedJoinNodeAttributeCollector.java
index 65ae08eb6a..f489df9264 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ConstantifiedJoinNodeAttributeCollector.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ConstantifiedJoinNodeAttributeCollector.java
@@ -44,11 +44,11 @@
 import com.blazebit.persistence.spi.ExtendedAttribute;
 import com.blazebit.persistence.spi.ExtendedManagedType;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationImpl.java
index 9b47c2d05d..bce4cad3dd 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationImpl.java
@@ -548,7 +548,7 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TimeZone;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  *
@@ -1671,7 +1671,8 @@ private void loadInternalFunctions() {
 
         // null subquery function
         jpqlFunctionGroup = new JpqlFunctionGroup(NullSubqueryFunction.FUNCTION_NAME, false);
-        jpqlFunctionGroup.add(null, new NullSubqueryFunction());
+        jpqlFunctionGroup.add(null, new NullSubqueryFunction(null));
+        jpqlFunctionGroup.add("oracle", new NullSubqueryFunction(" from dual"));
         registerFunction(jpqlFunctionGroup);
 
         // subquery
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderFactoryImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderFactoryImpl.java
index ff88455d85..0988c7fd47 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderFactoryImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderFactoryImpl.java
@@ -30,9 +30,9 @@
 import com.blazebit.persistence.spi.JpqlFunctionKind;
 import com.blazebit.persistence.spi.PackageOpener;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.metamodel.Metamodel;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderImpl.java
index 081f89ffbb..94d7ae208e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderImpl.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.StartOngoingSetOperationCriteriaBuilder;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/EmbeddableSplittingVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/EmbeddableSplittingVisitor.java
index c0be23bcbb..de901edf4a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/EmbeddableSplittingVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/EmbeddableSplittingVisitor.java
@@ -37,14 +37,14 @@
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/EntityMetamodelImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/EntityMetamodelImpl.java
index 295c559b7b..45ff186893 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/EntityMetamodelImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/EntityMetamodelImpl.java
@@ -18,19 +18,19 @@
 import com.blazebit.persistence.spi.JpaProviderFactory;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.BasicType;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.BasicType;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.AbstractMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/EntitySelectResolveVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/EntitySelectResolveVisitor.java
index 359af758a6..0b630d7144 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/EntitySelectResolveVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/EntitySelectResolveVisitor.java
@@ -20,9 +20,9 @@
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.FetchType;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ExpressionUtils.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ExpressionUtils.java
index 8a069a1143..cc64b0e6b7 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ExpressionUtils.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ExpressionUtils.java
@@ -37,17 +37,17 @@
 import com.blazebit.persistence.spi.ExtendedAttribute;
 import com.blazebit.persistence.spi.ExtendedManagedType;
 
-import javax.persistence.Basic;
-import javax.persistence.ElementCollection;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.Basic;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
index 8c61b60a0d..a8bd632bb1 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ExtendedParameter.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.impl;
 
-import javax.persistence.Parameter;
+import jakarta.persistence.Parameter;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/FunctionalDependencyAnalyzerVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/FunctionalDependencyAnalyzerVisitor.java
index 7258ed8ea4..e46992380b 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/FunctionalDependencyAnalyzerVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/FunctionalDependencyAnalyzerVisitor.java
@@ -38,13 +38,13 @@
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinManager.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinManager.java
index 7593ced05b..376691468d 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinManager.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinManager.java
@@ -65,16 +65,16 @@
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -2271,7 +2271,16 @@ private void addDefaultJoinsAndRenderJoinNode(StringBuilder sb, JoinAliasInfo jo
             if (!renderReverseDependency(sb, node, aliasPrefix, renderFetches, nodesToFetch, whereConjuncts, placeholderRequiringNodes, externalRepresentation, lateralExample)) {
                 // If we couldn't render the join node because one of it's parents or dependencies parents isn't rendered yet, we defer the rendering
                 renderedJoins.remove(node);
-                stack.add(Math.max(0, stack.size() - 1), node);
+                int insertionIndex = Math.max( 0, stack.size() - 1 );
+                for (int i = insertionIndex; i < stack.size(); i++) {
+                    JoinNode stackNode = stack.get(i);
+                    if (stackNode.isRootJoinNode()) {
+                        // Mark other root join nodes that will be rendered before this node as cross joins,
+                        // to retain the visibility of the aliases used in the ON clause
+                        stackNode.setCrossJoin();
+                    }
+                }
+                stack.add(insertionIndex, node);
                 return;
             }
         }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinNode.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinNode.java
index d97085bb0a..098a153857 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinNode.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinNode.java
@@ -27,11 +27,11 @@
 import com.blazebit.persistence.parser.predicate.Predicate;
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinTreeNode.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinTreeNode.java
index 80d448c5f6..37ae9f5b41 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinTreeNode.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinTreeNode.java
@@ -10,7 +10,7 @@
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinVisitor.java
index 8e8e2ef858..5ab5ce2a7a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/JoinVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/JoinVisitor.java
@@ -32,9 +32,9 @@
 import com.blazebit.persistence.parser.util.ExpressionUtils;
 import com.blazebit.persistence.spi.ExtendedManagedType;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java
index 206e51fcc4..3e79377f0a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java
@@ -29,13 +29,13 @@
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/LeafOngoingSetOperationSubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/LeafOngoingSetOperationSubqueryBuilderImpl.java
index 0ab8520536..b5f954d7e8 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/LeafOngoingSetOperationSubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/LeafOngoingSetOperationSubqueryBuilderImpl.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionFactory;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.Map;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/MainQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/MainQuery.java
index 2ded406e35..0e9dc918ee 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/MainQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/MainQuery.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.spi.JpqlFunction;
 import com.blazebit.persistence.spi.JpqlMacro;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Map;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ManagedEntityAssociationParameterTransformerFactory.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ManagedEntityAssociationParameterTransformerFactory.java
index 931987abd5..7a7ebec133 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ManagedEntityAssociationParameterTransformerFactory.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ManagedEntityAssociationParameterTransformerFactory.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/OngoingSetOperationSubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/OngoingSetOperationSubqueryBuilderImpl.java
index 9bb5b8fba9..f91cf9145a 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/OngoingSetOperationSubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/OngoingSetOperationSubqueryBuilderImpl.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionFactory;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.Map;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
index 7687260fc1..714c6e1655 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
@@ -55,8 +55,8 @@
 import com.blazebit.persistence.parser.predicate.Predicate;
 import com.blazebit.persistence.spi.AttributeAccessor;
 
-import javax.persistence.Parameter;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TypedQuery;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -999,9 +999,15 @@ private Map.Entry<TypedQuery<T>, ObjectBuilder<T>> getObjectQuery(boolean normal
         return new AbstractMap.SimpleEntry<TypedQuery<T>, ObjectBuilder<T>>(query, objectBuilder);
     }
 
-    private TypedQuery<Object[]> getIdQuery(String idQueryString, boolean normalQueryMode, Set<JoinNode> keyRestrictedLeftJoins, List<JoinNode> entityFunctions) {
+    private TypedQuery<?> getIdQuery(String idQueryString, boolean normalQueryMode, Set<JoinNode> keyRestrictedLeftJoins, List<JoinNode> entityFunctions) {
+        Class<?> resultType;
+        if (needsNewIdList || withInlineCountQuery) {
+            resultType = Object[].class;
+        } else {
+            resultType = Object.class;
+        }
         if (normalQueryMode && isEmpty(keyRestrictedLeftJoins, ID_QUERY_CLAUSE_EXCLUSIONS)) {
-            TypedQuery<Object[]> idQuery = em.createQuery(idQueryString, Object[].class);
+            TypedQuery<?> idQuery = em.createQuery(idQueryString, resultType);
             if (isCacheable()) {
                 mainQuery.jpaProvider.setCacheable(idQuery);
             }
@@ -1014,7 +1020,7 @@ private TypedQuery<Object[]> getIdQuery(String idQueryString, boolean normalQuer
             return parameterManager.getCriteriaNameMapping() == null ? idQuery : new TypedQueryWrapper<>(idQuery, parameterManager.getCriteriaNameMapping());
         }
 
-        TypedQuery<Object[]> baseQuery = em.createQuery(idQueryString, Object[].class);
+        TypedQuery<?> baseQuery = em.createQuery(idQueryString, resultType);
         Set<String> parameterListNames = parameterManager.getParameterListNames(baseQuery);
 
         List<String> keyRestrictedLeftJoinAliases = getKeyRestrictedLeftJoinAliases(baseQuery, keyRestrictedLeftJoins, ID_QUERY_CLAUSE_EXCLUSIONS);
@@ -1026,7 +1032,7 @@ private TypedQuery<Object[]> getIdQuery(String idQueryString, boolean normalQuer
                 mainQuery.cteManager.isRecursive(), ctes, shouldRenderCteNodes, mainQuery.getQueryConfiguration().isQueryPlanCacheEnabled(), null
         );
 
-        CustomSQLTypedQuery<Object[]> idQuery = new CustomSQLTypedQuery<Object[]>(
+        CustomSQLTypedQuery<?> idQuery = new CustomSQLTypedQuery<>(
                 querySpecification,
                 baseQuery,
                 parameterManager.getCriteriaNameMapping(),
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQueryImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQueryImpl.java
index fef09c3104..1efe0a64b2 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQueryImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedTypedQueryImpl.java
@@ -17,16 +17,16 @@
 import com.blazebit.persistence.impl.keyset.KeysetPaginationHelper;
 import com.blazebit.persistence.impl.util.SetView;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.Parameter;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
index c7d60ee7bf..2b9cf058ce 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterManager.java
@@ -14,9 +14,9 @@
 import com.blazebit.persistence.spi.AttributeAccessor;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
@@ -59,7 +59,7 @@ public class ParameterManager {
     private final Map<String, String> valuesParameters = new TreeMap<>();
     private final ParameterRegistrationVisitor parameterRegistrationVisitor;
     private final ParameterUnregistrationVisitor parameterUnregistrationVisitor;
-    private Map<javax.persistence.criteria.ParameterExpression<?>, String> criteriaNameMapping;
+    private Map<jakarta.persistence.criteria.ParameterExpression<?>, String> criteriaNameMapping;
     private int positionalOffset = -1; // Records the last positional parameter index that was used
 
     public ParameterManager(JpaProvider jpaProvider, EntityMetamodel entityMetamodel) {
@@ -183,7 +183,7 @@ void collectParameterListNames(Query q, Set<String> parameterListNames, String s
             String parameterName = p.getName();
             // In case of positional parameters, we convert the position to a string and look it up instead
             if (parameterName == null) {
-                if (criteriaNameMapping != null && p instanceof javax.persistence.criteria.ParameterExpression<?>) {
+                if (criteriaNameMapping != null && p instanceof jakarta.persistence.criteria.ParameterExpression<?>) {
                     parameterName = criteriaNameMapping.get(p);
                 } else {
                     parameterName = p.getPosition().toString();
@@ -208,7 +208,7 @@ void parameterizeQuery(Query q, String skippedParameterPrefix) {
             String parameterName = p.getName();
             // In case of positional parameters, we convert the position to a string and look it up instead
             if (parameterName == null) {
-                if (criteriaNameMapping != null && p instanceof javax.persistence.criteria.ParameterExpression<?>) {
+                if (criteriaNameMapping != null && p instanceof jakarta.persistence.criteria.ParameterExpression<?>) {
                     parameterName = criteriaNameMapping.get(p);
                 } else {
                     parameterName = p.getPosition().toString();
@@ -259,7 +259,7 @@ public Collection<ParameterImpl<?>> getParameterImpls() {
         return parameters.values();
     }
 
-    public Map<javax.persistence.criteria.ParameterExpression<?>, String> getCriteriaNameMapping() {
+    public Map<jakarta.persistence.criteria.ParameterExpression<?>, String> getCriteriaNameMapping() {
         return criteriaNameMapping;
     }
 
@@ -503,7 +503,7 @@ public void setParameterType(String parameterName, Class<?> type) {
         parameter.setParameterType((Class) type);
     }
 
-    public <X> void registerCriteriaParameter(String parameterName, javax.persistence.criteria.ParameterExpression<X> parameterExpression) {
+    public <X> void registerCriteriaParameter(String parameterName, jakarta.persistence.criteria.ParameterExpression<X> parameterExpression) {
         if (parameterName == null) {
             throw new NullPointerException("parameterName");
         }
@@ -540,7 +540,7 @@ public static final class ParameterImpl<T> implements ExtendedParameter<T> {
         private final Map<ClauseType, Set<AbstractCommonQueryBuilder<?, ?, ?, ?, ?>>> clauseTypes;
         private boolean usedInImplicitGroupBy;
         private Class<T> parameterType;
-        private javax.persistence.criteria.ParameterExpression<T> criteriaParameter;
+        private jakarta.persistence.criteria.ParameterExpression<T> criteriaParameter;
         private T value;
         private boolean valueSet;
         private ParameterValueTransformer transformer;
@@ -619,11 +619,11 @@ public void setParameterType(Class<T> parameterType) {
             this.parameterType = parameterType;
         }
 
-        public javax.persistence.criteria.ParameterExpression<T> getCriteriaParameter() {
+        public jakarta.persistence.criteria.ParameterExpression<T> getCriteriaParameter() {
             return criteriaParameter;
         }
 
-        public void setCriteriaParameter(javax.persistence.criteria.ParameterExpression<T> criteriaParameter) {
+        public void setCriteriaParameter(jakarta.persistence.criteria.ParameterExpression<T> criteriaParameter) {
             this.criteriaParameter = criteriaParameter;
             this.parameterType = criteriaParameter.getParameterType();
         }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterValueTransformer.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterValueTransformer.java
index d550414ae6..3fdaac805c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterValueTransformer.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ParameterValueTransformer.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.impl;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ResolvingQueryGenerator.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ResolvingQueryGenerator.java
index f9a0dcb153..2eec5c940e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ResolvingQueryGenerator.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ResolvingQueryGenerator.java
@@ -51,13 +51,13 @@
 import com.blazebit.persistence.spi.JpaProvider;
 import com.blazebit.persistence.spi.JpqlFunction;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Arrays;
@@ -292,7 +292,9 @@ protected boolean isSimpleSubquery(SubqueryExpression expression) {
             final boolean hasLimit = hasFirstResult || hasMaxResults;
             final boolean hasSetOperations = subquery instanceof BaseFinalSetOperationBuilder<?, ?>;
             final boolean hasEntityFunctions = subquery.joinManager.hasEntityFunctions();
-            return !hasLimit && !hasSetOperations && !hasEntityFunctions && !subquery.joinManager.hasLateInlineNodes();
+            return (jpaProvider.supportsSubqueryLimitOffset() || !hasLimit)
+                    && (jpaProvider.supportsSetOperations() || !hasSetOperations)
+                    && !hasEntityFunctions && !subquery.joinManager.hasLateInlineNodes();
         }
         return super.isSimpleSubquery(expression);
     }
@@ -885,37 +887,22 @@ public void visit(ArrayExpression expression) {
     public void visit(InPredicate predicate) {
         boolean quantifiedPredicate = this.quantifiedPredicate;
         this.quantifiedPredicate = true;
-        if (predicate.getRight().size() == 1 && jpaProvider.needsAssociationToIdRewriteInOnClause() && clauseType == ClauseType.JOIN) {
-            Expression right = predicate.getRight().get(0);
-            if (right instanceof ParameterExpression) {
-                ParameterExpression parameterExpression = (ParameterExpression) right;
-                @SuppressWarnings("unchecked")
-                Type<?> associationType = getAssociationType(predicate.getLeft(), right);
-                // If the association type is a entity type, we transform it
-                if (associationType instanceof EntityType<?>) {
-                    renderEquality(predicate.getLeft(), right, predicate.isNegated(), PredicateQuantifier.ONE);
-                } else {
-                    super.visit(predicate);
-                }
-            } else if (right instanceof PathExpression) {
-                renderEquality(predicate.getLeft(), right, predicate.isNegated(), PredicateQuantifier.ONE);
-            } else {
-                super.visit(predicate);
-            }
+        Expression right;
+        SubqueryExpression subqueryExpression;
+        if (!externalRepresentation
+                && predicate.getRight().size() == 1 && (right = predicate.getRight().get(0)) instanceof SubqueryExpression
+                && (subqueryExpression = (SubqueryExpression) right).getSubquery() instanceof SubqueryInternalBuilder<?>
+                && ((SubqueryInternalBuilder<?>) subqueryExpression.getSubquery()).getMaxResults() == 1) {
+            // This is a special rewrite for databases like e.g. MySQL
+            predicate.getLeft().accept(this);
+            sb.append(predicate.isNegated() ? " <> " : " = ");
+            right.accept(this);
         } else {
             super.visit(predicate);
         }
         this.quantifiedPredicate = quantifiedPredicate;
     }
 
-    private Type<?> getAssociationType(Expression expression1, Expression expression2) {
-        if (expression1 instanceof PathExpression) {
-            return ((PathExpression) expression1).getPathReference().getType();
-        }
-
-        return ((PathExpression) expression2).getPathReference().getType();
-    }
-
     @Override
     public void visit(final EqPredicate predicate) {
         boolean quantifiedPredicate = this.quantifiedPredicate;
@@ -938,60 +925,47 @@ private void renderEquality(Expression left, Expression right, boolean negated,
 
         Expression expressionToSplit = needsEmbeddableSplitting(left, right);
 
-        if (jpaProvider.needsAssociationToIdRewriteInOnClause() && clauseType == ClauseType.JOIN) {
-            boolean rewritten = renderAssociationIdIfPossible(left);
+        if (expressionToSplit == null || !(left instanceof ParameterExpression) && !(right instanceof ParameterExpression)) {
+            left.accept(this);
             sb.append(operator);
             if (quantifier != PredicateQuantifier.ONE) {
                 sb.append(quantifier.toString());
             }
-            rewritten |= renderAssociationIdIfPossible(right);
-            if (rewritten) {
-                rewriteToIdParam(left);
-                rewriteToIdParam(right);
-            }
+            right.accept(this);
         } else {
-            if (expressionToSplit == null || dbmsDialect.supportsAnsiRowValueConstructor() || !(left instanceof ParameterExpression) && !(right instanceof ParameterExpression)) {
-                left.accept(this);
-                sb.append(operator);
-                if (quantifier != PredicateQuantifier.ONE) {
-                    sb.append(quantifier.toString());
-                }
-                right.accept(this);
+            // We split the path and the parameter expression accordingly
+            // TODO: Try to handle map key expressions, although no JPA provider supports de-referencing map keys
+            PathExpression pathExpression = (PathExpression) expressionToSplit;
+            ParameterExpression parameterExpression;
+            if (left instanceof ParameterExpression) {
+                parameterExpression = (ParameterExpression) left;
             } else {
-                // We split the path and the parameter expression accordingly
-                // TODO: Try to handle map key expressions, although no JPA provider supports de-referencing map keys
-                PathExpression pathExpression = (PathExpression) expressionToSplit;
-                ParameterExpression parameterExpression;
-                if (left instanceof ParameterExpression) {
-                    parameterExpression = (ParameterExpression) left;
-                } else {
-                    parameterExpression = (ParameterExpression) right;
+                parameterExpression = (ParameterExpression) right;
+            }
+            PathReference pathReference = pathExpression.getPathReference();
+            EmbeddableType<?> embeddableType = (EmbeddableType<?>) pathReference.getType();
+            String parameterName = parameterExpression.getName();
+            Map<String, List<String>> parameterAccessPaths = new HashMap<>();
+            ParameterManager.ParameterImpl<?> parameter = parameterManager.getParameter(parameterName);
+            sb.append('(');
+            for (Attribute<?, ?> attribute : embeddableType.getAttributes()) {
+                ((JoinNode) pathReference.getBaseNode()).appendDeReference(sb, pathReference.getField() + "." + attribute.getName(), externalRepresentation);
+                String embeddedPropertyName = attribute.getName();
+                String subParamName = "_" + parameterName + "_" + embeddedPropertyName.replace('.', '_');
+                sb.append(operator);
+                sb.append(":").append(subParamName);
+                if (parameter.getTransformer() == null) {
+                    parameterManager.registerParameterName(subParamName, false, null, null);
                 }
-                PathReference pathReference = pathExpression.getPathReference();
-                EmbeddableType<?> embeddableType = (EmbeddableType<?>) pathReference.getType();
-                String parameterName = parameterExpression.getName();
-                Map<String, List<String>> parameterAccessPaths = new HashMap<>();
-                ParameterManager.ParameterImpl<?> parameter = parameterManager.getParameter(parameterName);
-                sb.append('(');
-                for (Attribute<?, ?> attribute : embeddableType.getAttributes()) {
-                    ((JoinNode) pathReference.getBaseNode()).appendDeReference(sb, pathReference.getField() + "." + attribute.getName(), externalRepresentation);
-                    String embeddedPropertyName = attribute.getName();
-                    String subParamName = "_" + parameterName + "_" + embeddedPropertyName.replace('.', '_');
-                    sb.append(operator);
-                    sb.append(":").append(subParamName);
-                    if (parameter.getTransformer() == null) {
-                        parameterManager.registerParameterName(subParamName, false, null, null);
-                    }
-                    parameterAccessPaths.put(subParamName, Arrays.asList(embeddedPropertyName.split("\\.")));
+                parameterAccessPaths.put(subParamName, Arrays.asList(embeddedPropertyName.split("\\.")));
 
-                    sb.append(" AND ");
-                }
-                sb.setLength(sb.length() - " AND ".length());
-                sb.append(')');
+                sb.append(" AND ");
+            }
+            sb.setLength(sb.length() - " AND ".length());
+            sb.append(')');
 
-                if (parameter.getTransformer() == null) {
-                    parameter.setTransformer(new SplittingParameterTransformer(parameterManager, entityMetamodel, embeddableType.getJavaType(), parameterAccessPaths));
-                }
+            if (parameter.getTransformer() == null) {
+                parameter.setTransformer(new SplittingParameterTransformer(parameterManager, entityMetamodel, embeddableType.getJavaType(), parameterAccessPaths));
             }
         }
         setBooleanLiteralRenderingContext(oldBooleanLiteralRenderingContext);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SelectManager.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SelectManager.java
index 484b1a1626..1e41273561 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SelectManager.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SelectManager.java
@@ -50,11 +50,11 @@
 import com.blazebit.persistence.spi.JpqlFunction;
 import com.blazebit.persistence.spi.JpqlFunctionProcessor;
 
-import javax.persistence.Tuple;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SimplePathReference.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SimplePathReference.java
index 9e9403d907..3ed1eb0912 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SimplePathReference.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SimplePathReference.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.parser.expression.BaseNode;
 import com.blazebit.persistence.parser.expression.PathReference;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingParameterTransformer.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingParameterTransformer.java
index 87a1fb1c46..d5de775085 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingParameterTransformer.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingParameterTransformer.java
@@ -9,9 +9,9 @@
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingVisitor.java
index b85d201835..23fb74c7a0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SplittingVisitor.java
@@ -15,7 +15,7 @@
 import com.blazebit.persistence.parser.expression.PropertyExpression;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/StartOngoingSetOperationSubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/StartOngoingSetOperationSubqueryBuilderImpl.java
index b1a74563ab..9362b97229 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/StartOngoingSetOperationSubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/StartOngoingSetOperationSubqueryBuilderImpl.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionFactory;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.Map;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryBuilderImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryBuilderImpl.java
index 828c194827..41c59b17de 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryBuilderImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryBuilderImpl.java
@@ -15,7 +15,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionFactory;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryInitiatorImpl.java b/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryInitiatorImpl.java
index cd349ec812..3cd5d023f7 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryInitiatorImpl.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/SubqueryInitiatorImpl.java
@@ -15,7 +15,7 @@
 import com.blazebit.persistence.parser.expression.ExpressionCopyContext;
 import com.blazebit.persistence.parser.expression.ExpressionFactory;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Arrays;
 import java.util.Collection;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/TransientEntityAssociationParameterTransformerFactory.java b/core/impl/src/main/java/com/blazebit/persistence/impl/TransientEntityAssociationParameterTransformerFactory.java
index f179ccc057..e9e7e02cbc 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/TransientEntityAssociationParameterTransformerFactory.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/TransientEntityAssociationParameterTransformerFactory.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.parser.EntityMetamodel;
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.IdentifiableType;
 
 /**
  * @author Christian Beikov
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/TreatedJoinAliasInfo.java b/core/impl/src/main/java/com/blazebit/persistence/impl/TreatedJoinAliasInfo.java
index 806d7ae35b..5e82e8861e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/TreatedJoinAliasInfo.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/TreatedJoinAliasInfo.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.impl;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  * This is the join alias info for "special" join nodes that aren't rendered as joins
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/ValuesParameterBinder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/ValuesParameterBinder.java
index 7adcdfe6e8..e992bf9af6 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/ValuesParameterBinder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/ValuesParameterBinder.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.spi.AttributeAccessor;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collection;
 import java.util.Iterator;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/DelegatingTupleObjectBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/DelegatingTupleObjectBuilder.java
index 4c4131ac34..5e6f33f81c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/DelegatingTupleObjectBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/DelegatingTupleObjectBuilder.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.ObjectBuilder;
 import com.blazebit.persistence.impl.SelectInfo;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.List;
 import java.util.Map;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/ReturningTupleObjectBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/ReturningTupleObjectBuilder.java
index a29c0fcf28..9112bae244 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/ReturningTupleObjectBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/ReturningTupleObjectBuilder.java
@@ -9,8 +9,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.persistence.Tuple;
-import javax.persistence.TupleElement;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TupleElement;
 
 import com.blazebit.persistence.ReturningObjectBuilder;
 import com.blazebit.persistence.SimpleReturningBuilder;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/TupleObjectBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/TupleObjectBuilder.java
index af80250163..1174125500 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/TupleObjectBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/object/TupleObjectBuilder.java
@@ -10,8 +10,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.Tuple;
-import javax.persistence.TupleElement;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TupleElement;
 
 import com.blazebit.persistence.ObjectBuilder;
 import com.blazebit.persistence.SelectBuilder;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/predicate/AbstractQuantifiablePredicateBuilder.java b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/predicate/AbstractQuantifiablePredicateBuilder.java
index c45cde33cd..9bad38a91d 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/builder/predicate/AbstractQuantifiablePredicateBuilder.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/builder/predicate/AbstractQuantifiablePredicateBuilder.java
@@ -42,7 +42,7 @@
 import com.blazebit.persistence.parser.predicate.QuantifiableBinaryExpressionPredicate;
 import com.blazebit.persistence.parser.util.TypeUtils;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Collection;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/DefaultDbmsDialect.java b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/DefaultDbmsDialect.java
index 1e5142f932..fc4d7365df 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/DefaultDbmsDialect.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/DefaultDbmsDialect.java
@@ -87,7 +87,7 @@ public boolean supportsNonRecursiveWithClause() {
     }
 
     @Override
-    public boolean supportsWithClauseHead() {
+    public boolean supportsPaginationInWithClause() {
         return supportsWithClause();
     }
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/OracleDbmsDialect.java b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/OracleDbmsDialect.java
index aa73946a0b..a8700a2553 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/OracleDbmsDialect.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/OracleDbmsDialect.java
@@ -107,9 +107,9 @@ public String getWithClause(boolean recursive) {
     }
 
     @Override
-    public boolean supportsWithClauseHead() {
-        // NOTE: For 10g return false
-        return true;
+    public boolean supportsPaginationInWithClause() {
+        // Actually, only need it for Hibernate ORM
+        return false;
     }
 
     @Override
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/PostgreSQLDbmsDialect.java b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/PostgreSQLDbmsDialect.java
index 2c2343c7c1..886bfa4c03 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/PostgreSQLDbmsDialect.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/dialect/PostgreSQLDbmsDialect.java
@@ -191,12 +191,14 @@ public Map<String, String> appendExtendedSql(StringBuilder sqlSb, DbmsStatementT
         if (returningColumns != null) {
             sqlSb.append(" returning ");
 
+            int start = withClause == null ? 0 : withClause.length();
+            String alias = determineAlias(sqlSb, dmlAffectedTable, start, statementType);
             for (int i = 0; i < returningColumns.length; i++) {
                 if (i != 0) {
                     sqlSb.append(",");
                 }
 
-                sqlSb.append(dmlAffectedTable).append('.');
+                sqlSb.append(alias).append('.');
                 sqlSb.append(returningColumns[i]);
             }
         }
@@ -207,7 +209,38 @@ public Map<String, String> appendExtendedSql(StringBuilder sqlSb, DbmsStatementT
         
         return null;
     }
-    
+
+    private String determineAlias(StringBuilder sqlSb, String dmlAffectedTable, int start, DbmsStatementType statementType) {
+        int tableIndex = sqlSb.indexOf(" " + dmlAffectedTable + " ", start);
+        int aliasIndex = tableIndex + dmlAffectedTable.length() + 2;
+        if (statementType == DbmsStatementType.UPDATE) {
+            int setIndex = SqlUtils.indexOfSet(sqlSb, aliasIndex);
+            if (setIndex != -1) {
+                return sqlSb.substring(aliasIndex, setIndex);
+            }
+        } else if (statementType == DbmsStatementType.INSERT) {
+            int parenthesisIndex = sqlSb.indexOf("(", aliasIndex);
+            int asIndex = sqlSb.indexOf( " as ", aliasIndex - 1);
+            if (asIndex != -1 && asIndex < parenthesisIndex) {
+                return sqlSb.substring(asIndex + 4, parenthesisIndex).trim();
+            }
+        } else {
+            int whereIndex = SqlUtils.indexOfWhere(sqlSb, start);
+            if (whereIndex != -1) {
+                int usingIndex = sqlSb.indexOf( " using " );
+                if (usingIndex == -1) {
+                    return sqlSb.substring(aliasIndex, whereIndex);
+                }
+            } else {
+                int nextSpaceIndex = sqlSb.indexOf(" ", aliasIndex + 1);
+                if (nextSpaceIndex != -1 && " returning ".equals(sqlSb.substring(nextSpaceIndex))) {
+                    return sqlSb.substring(aliasIndex, nextSpaceIndex);
+                }
+            }
+        }
+        return dmlAffectedTable;
+    }
+
     @Override
     protected String[] appendSetOperands(StringBuilder sqlSb, SetOperationType setType, String operator, boolean isSubquery, List<String> operands, boolean hasOuterClause) {
         boolean first = true;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/function/entity/ValuesEntity.java b/core/impl/src/main/java/com/blazebit/persistence/impl/function/entity/ValuesEntity.java
index a604c45edf..090271e25c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/function/entity/ValuesEntity.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/function/entity/ValuesEntity.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/function/nullsubquery/NullSubqueryFunction.java b/core/impl/src/main/java/com/blazebit/persistence/impl/function/nullsubquery/NullSubqueryFunction.java
index 88aee72b34..d988ddc076 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/function/nullsubquery/NullSubqueryFunction.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/function/nullsubquery/NullSubqueryFunction.java
@@ -17,6 +17,12 @@ public class NullSubqueryFunction implements JpqlFunction {
 
     public static final String FUNCTION_NAME = "null_subquery";
 
+    private final String fromDual;
+
+    public NullSubqueryFunction(String fromDual) {
+        this.fromDual = fromDual;
+    }
+
     @Override
     public boolean hasArguments() {
         return true;
@@ -34,6 +40,10 @@ public Class<?> getReturnType(Class<?> firstArgumentType) {
 
     @Override
     public void render(FunctionRenderContext context) {
-        context.addChunk("(select null)");
+        context.addChunk("(select null");
+        if (fromDual != null) {
+            context.addChunk(fromDual);
+        }
+        context.addChunk(")");
     }
 }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/OracleToStringJsonFunction.java b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/OracleToStringJsonFunction.java
index c2e44130a2..40c1fe5fb0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/OracleToStringJsonFunction.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/OracleToStringJsonFunction.java
@@ -38,8 +38,7 @@ public void render(FunctionRenderContext context, String[] fields, String[] sele
             context.addChunk(postChunk);
             context.addChunk(subquery.substring(fromIndex));
         } else {
-            int limitIndex = SqlUtils.indexOfLimit(subquery, orderByIndex);
-            if (limitIndex == -1) {
+            if (SqlUtils.indexOfLimit(subquery, orderByIndex) == -1 && SqlUtils.indexOfFetchFirst(subquery, orderByIndex) == -1) {
                 context.addChunk(preChunk);
 
                 StringBuilder sb = new StringBuilder(fromIndex);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/PostgreSQLToStringJsonFunction.java b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/PostgreSQLToStringJsonFunction.java
index 8a0fefca71..dde6fc1696 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/PostgreSQLToStringJsonFunction.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringjson/PostgreSQLToStringJsonFunction.java
@@ -26,8 +26,7 @@ public void render(FunctionRenderContext context, String[] fields, String[] sele
             context.addChunk("))");
             context.addChunk(subquery.substring(fromIndex));
         } else {
-            int limitIndex = SqlUtils.indexOfLimit(subquery, orderByIndex);
-            if (limitIndex == -1) {
+            if (SqlUtils.indexOfLimit(subquery, orderByIndex) == -1 && SqlUtils.indexOfFetchFirst(subquery, orderByIndex) == -1) {
                 renderJsonObjectArguments(context, fields, selectItemExpressions);
                 context.addChunk("))");
                 context.addChunk(" OVER (");
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringxml/PostgreSQLToStringXmlFunction.java b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringxml/PostgreSQLToStringXmlFunction.java
index d88768c7c5..df7851f706 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringxml/PostgreSQLToStringXmlFunction.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/function/tostringxml/PostgreSQLToStringXmlFunction.java
@@ -26,8 +26,7 @@ public void render(FunctionRenderContext context, String[] fields, String[] sele
             context.addChunk("))");
             context.addChunk(subquery.substring(fromIndex));
         } else {
-            int limitIndex = SqlUtils.indexOfLimit(subquery, orderByIndex);
-            if (limitIndex == -1) {
+            if (SqlUtils.indexOfLimit(subquery, orderByIndex) == -1 && SqlUtils.indexOfFetchFirst(subquery, orderByIndex) == -1) {
                 renderXmlElementArguments(context, fields, selectItemExpressions);
                 context.addChunk("))");
                 context.addChunk(" OVER (");
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomModificationQueryPlan.java b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomModificationQueryPlan.java
index c1cdb26eee..87b4fada74 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomModificationQueryPlan.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomModificationQueryPlan.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomReturningModificationQueryPlan.java b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomReturningModificationQueryPlan.java
index a118271ebe..c6907fd2ef 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomReturningModificationQueryPlan.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomReturningModificationQueryPlan.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomSelectQueryPlan.java b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomSelectQueryPlan.java
index 72cdc00ddd..2fb5518617 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomSelectQueryPlan.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/CustomSelectQueryPlan.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultModificationQueryPlan.java b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultModificationQueryPlan.java
index 33574cccc0..b65329c8c0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultModificationQueryPlan.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultModificationQueryPlan.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.spi.DbmsStatementType;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultSelectQueryPlan.java b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultSelectQueryPlan.java
index 03237770f8..2f8588e76c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultSelectQueryPlan.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/plan/DefaultSelectQueryPlan.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.impl.plan;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
index 797a78787e..1c15d470e0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/AbstractCustomQuery.java
@@ -11,10 +11,10 @@
 import com.blazebit.persistence.impl.util.SetView;
 import com.blazebit.persistence.spi.CteQueryWrapper;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
index f2448ecc0b..3790c61800 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CTEQuerySpecification.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.impl.AbstractCommonQueryBuilder;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
index 02c82e028d..e0573d8e32 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionDeleteModificationQuerySpecification.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
index e7203becce..4134f6d8c3 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionInsertModificationQuerySpecification.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
index 70f099c3bb..d2fafd4aac 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CollectionUpdateModificationQuerySpecification.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
index 7e7555e4da..986be201fc 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomQuerySpecification.java
@@ -18,9 +18,9 @@
 import com.blazebit.persistence.spi.LateralStyle;
 import com.blazebit.persistence.spi.ServiceProvider;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -239,17 +239,9 @@ public String extract(StringBuilder sb, int index, int currentPosition) {
                             newSqlSb.append(',');
                         }
 
-                        String originalAlias = SqlUtils.extractAlias(sb);
-                        int aliasPosition = sb.length() - originalAlias.length() - 1;
-                        // Replace the original alias with the new one
-                        if (aliasPosition != -1 && sb.charAt(aliasPosition) == ' ') {
-                            newSqlSb.append(sb, 0, aliasPosition + 1);
-                        } else {
-                            // Append the new alias
-                            newSqlSb.append(sb);
-                            newSqlSb.append(" as ");
-                        }
-
+                        // Append the new alias
+                        newSqlSb.append(sb);
+                        newSqlSb.append(" as ");
                         newSqlSb.append(newAliases[index]);
 
                         return Integer.toString(currentPosition);
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
index d00668c4a6..48efbf28e5 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomReturningSQLTypedQuery.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.impl.ParameterValueTransformer;
 import com.blazebit.persistence.impl.ValuesParameterBinder;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.PersistenceException;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.*;
 import java.util.stream.Stream;
 
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
index 5ad830c8c6..3fef04de8e 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLQuery.java
@@ -8,11 +8,11 @@
 import com.blazebit.persistence.impl.ParameterValueTransformer;
 import com.blazebit.persistence.impl.ValuesParameterBinder;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
index 0f7cd16f62..a0ff244b99 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/CustomSQLTypedQuery.java
@@ -8,14 +8,14 @@
 import com.blazebit.persistence.impl.ParameterValueTransformer;
 import com.blazebit.persistence.impl.ValuesParameterBinder;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
index ab9895b0e7..b924efc970 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DefaultQuerySpecification.java
@@ -12,9 +12,9 @@
 import com.blazebit.persistence.spi.DbmsStatementType;
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DeleteModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DeleteModificationQuerySpecification.java
index 777757ac37..669072a5b2 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/DeleteModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/DeleteModificationQuerySpecification.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.impl.util.SqlUtils;
 import com.blazebit.persistence.spi.DbmsModificationState;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
index 2fd5463a22..676934fd2b 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java
@@ -16,8 +16,8 @@
 import com.blazebit.persistence.spi.DbmsModificationState;
 import com.blazebit.persistence.spi.DbmsStatementType;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -107,7 +107,12 @@ protected void initialize() {
             affectedDmlTable = sqlQuery.substring(fromIndex + SqlUtils.FROM.length(), endIndex == -1 ? sqlQuery.length() : endIndex);
         } else if (statementType == DbmsStatementType.INSERT) {
             int intoIndex = sqlQuery.indexOf(" into ");
-            affectedDmlTable = sqlQuery.substring(intoIndex + " into ".length(), sqlQuery.indexOf('(', intoIndex + " into ".length() + 1));
+            int intoEndIndex = sqlQuery.indexOf('(', intoIndex + " into ".length() + 1);
+            affectedDmlTable = sqlQuery.substring(intoIndex + " into ".length(), intoEndIndex);
+            int asIndex = affectedDmlTable.indexOf(" as ");
+            if (asIndex != -1) {
+                affectedDmlTable = affectedDmlTable.substring(0, asIndex);
+            }
         } else {
             throw new UnsupportedOperationException("Unsupported statement type: " + statementType);
         }
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ObjectBuilderTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ObjectBuilderTypedQuery.java
index b9928e635a..e57adaccd3 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ObjectBuilderTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ObjectBuilderTypedQuery.java
@@ -13,10 +13,10 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
index f93731626e..654165761c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QuerySpecification.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.impl.plan.ModificationQueryPlan;
 import com.blazebit.persistence.impl.plan.SelectQueryPlan;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QueryWrapper.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QueryWrapper.java
index c6bf138a2f..e0912b8972 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/QueryWrapper.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/QueryWrapper.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.impl.query;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
index 4798edc029..7bfebfec6f 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetOperationQuerySpecification.java
@@ -11,8 +11,8 @@
 import com.blazebit.persistence.spi.OrderByElement;
 import com.blazebit.persistence.spi.SetOperationType;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetTypedQuery.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetTypedQuery.java
index 7f9486bbc2..4304e1a3d0 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetTypedQuery.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/SetTypedQuery.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.impl.query;
 
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 /**
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/TypedQueryWrapper.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/TypedQueryWrapper.java
index da8ac4a522..5870d7829c 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/TypedQueryWrapper.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/TypedQueryWrapper.java
@@ -10,12 +10,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.ParameterExpression;
 
 /**
  *
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/UpdateModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/UpdateModificationQuerySpecification.java
index 9ba6d7a279..921bba7448 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/UpdateModificationQuerySpecification.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/UpdateModificationQuerySpecification.java
@@ -11,8 +11,8 @@
 import com.blazebit.persistence.spi.DbmsModificationState;
 import com.blazebit.persistence.spi.UpdateJoinStyle;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/transform/SizeTransformationVisitor.java b/core/impl/src/main/java/com/blazebit/persistence/impl/transform/SizeTransformationVisitor.java
index af5a116290..94887558b4 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/transform/SizeTransformationVisitor.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/transform/SizeTransformationVisitor.java
@@ -36,14 +36,14 @@
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 import com.blazebit.persistence.spi.JpaProvider;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-import javax.persistence.metamodel.Type.PersistenceType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type.PersistenceType;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/util/SqlUtils.java b/core/impl/src/main/java/com/blazebit/persistence/impl/util/SqlUtils.java
index a2ae4511b2..9335674aa7 100644
--- a/core/impl/src/main/java/com/blazebit/persistence/impl/util/SqlUtils.java
+++ b/core/impl/src/main/java/com/blazebit/persistence/impl/util/SqlUtils.java
@@ -514,8 +514,8 @@ public static int indexOfSelect(CharSequence sql) {
         return indexOf(SELECT_FINDER, sql, 0, Math.max(withIndex, 0));
     }
 
-    public static int indexOfSet(CharSequence sql) {
-        return indexOf(SET_FINDER, sql, 0, 0);
+    public static int indexOfSet(CharSequence sql, int start) {
+        return indexOf(SET_FINDER, sql, start, 0);
     }
 
     public static int indexOfFrom(CharSequence sql) {
diff --git a/core/impl/src/main/java/module-info.java b/core/impl/src/main/java/module-info.java
new file mode 100644
index 0000000000..03c69c1231
--- /dev/null
+++ b/core/impl/src/main/java/module-info.java
@@ -0,0 +1,139 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+module com.blazebit.persistence.core.impl {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.core;
+	requires com.blazebit.persistence.core.parser;
+	exports com.blazebit.persistence.impl;
+	exports com.blazebit.persistence.impl.builder.expression;
+	exports com.blazebit.persistence.impl.builder.object;
+	exports com.blazebit.persistence.impl.builder.predicate;
+	exports com.blazebit.persistence.impl.dialect;
+	exports com.blazebit.persistence.impl.function;
+	exports com.blazebit.persistence.impl.function.alias;
+	exports com.blazebit.persistence.impl.function.base64;
+	exports com.blazebit.persistence.impl.function.cast;
+	exports com.blazebit.persistence.impl.function.chr;
+	exports com.blazebit.persistence.impl.function.colldml;
+	exports com.blazebit.persistence.impl.function.coltrunc;
+	exports com.blazebit.persistence.impl.function.concat;
+	exports com.blazebit.persistence.impl.function.count;
+	exports com.blazebit.persistence.impl.function.countwrapper;
+	exports com.blazebit.persistence.impl.function.dateadd;
+	exports com.blazebit.persistence.impl.function.dateadd.day;
+	exports com.blazebit.persistence.impl.function.dateadd.hour;
+	exports com.blazebit.persistence.impl.function.dateadd.microseconds;
+	exports com.blazebit.persistence.impl.function.dateadd.milliseconds;
+	exports com.blazebit.persistence.impl.function.dateadd.minute;
+	exports com.blazebit.persistence.impl.function.dateadd.month;
+	exports com.blazebit.persistence.impl.function.dateadd.quarter;
+	exports com.blazebit.persistence.impl.function.dateadd.second;
+	exports com.blazebit.persistence.impl.function.dateadd.week;
+	exports com.blazebit.persistence.impl.function.dateadd.year;
+	exports com.blazebit.persistence.impl.function.datediff;
+	exports com.blazebit.persistence.impl.function.datediff.day;
+	exports com.blazebit.persistence.impl.function.datediff.hour;
+	exports com.blazebit.persistence.impl.function.datediff.microsecond;
+	exports com.blazebit.persistence.impl.function.datediff.millisecond;
+	exports com.blazebit.persistence.impl.function.datediff.minute;
+	exports com.blazebit.persistence.impl.function.datediff.month;
+	exports com.blazebit.persistence.impl.function.datediff.quarter;
+	exports com.blazebit.persistence.impl.function.datediff.second;
+	exports com.blazebit.persistence.impl.function.datediff.week;
+	exports com.blazebit.persistence.impl.function.datediff.year;
+	exports com.blazebit.persistence.impl.function.datetime.day;
+	exports com.blazebit.persistence.impl.function.datetime.dayofweek;
+	exports com.blazebit.persistence.impl.function.datetime.dayofyear;
+	exports com.blazebit.persistence.impl.function.datetime.epoch;
+	exports com.blazebit.persistence.impl.function.datetime.epochday;
+	exports com.blazebit.persistence.impl.function.datetime.epochmicro;
+	exports com.blazebit.persistence.impl.function.datetime.epochmilli;
+	exports com.blazebit.persistence.impl.function.datetime.hour;
+	exports com.blazebit.persistence.impl.function.datetime.isodayofweek;
+	exports com.blazebit.persistence.impl.function.datetime.isoweek;
+	exports com.blazebit.persistence.impl.function.datetime.microsecond;
+	exports com.blazebit.persistence.impl.function.datetime.millisecond;
+	exports com.blazebit.persistence.impl.function.datetime.minute;
+	exports com.blazebit.persistence.impl.function.datetime.month;
+	exports com.blazebit.persistence.impl.function.datetime.quarter;
+	exports com.blazebit.persistence.impl.function.datetime.second;
+	exports com.blazebit.persistence.impl.function.datetime.week;
+	exports com.blazebit.persistence.impl.function.datetime.year;
+	exports com.blazebit.persistence.impl.function.datetime.yearofweek;
+	exports com.blazebit.persistence.impl.function.datetime.yearweek;
+	exports com.blazebit.persistence.impl.function.entity;
+	exports com.blazebit.persistence.impl.function.every;
+	exports com.blazebit.persistence.impl.function.exist;
+	exports com.blazebit.persistence.impl.function.greatest;
+	exports com.blazebit.persistence.impl.function.groupconcat;
+	exports com.blazebit.persistence.impl.function.grouping;
+	exports com.blazebit.persistence.impl.function.groupingsets;
+	exports com.blazebit.persistence.impl.function.jsonget;
+	exports com.blazebit.persistence.impl.function.jsonset;
+	exports com.blazebit.persistence.impl.function.least;
+	exports com.blazebit.persistence.impl.function.limit;
+	exports com.blazebit.persistence.impl.function.literal;
+	exports com.blazebit.persistence.impl.function.nullfn;
+	exports com.blazebit.persistence.impl.function.nullsubquery;
+	exports com.blazebit.persistence.impl.function.oragg;
+	exports com.blazebit.persistence.impl.function.pageposition;
+	exports com.blazebit.persistence.impl.function.param;
+	exports com.blazebit.persistence.impl.function.querywrapper;
+	exports com.blazebit.persistence.impl.function.repeat;
+	exports com.blazebit.persistence.impl.function.replace;
+	exports com.blazebit.persistence.impl.function.rowvalue;
+	exports com.blazebit.persistence.impl.function.set;
+	exports com.blazebit.persistence.impl.function.stringjsonagg;
+	exports com.blazebit.persistence.impl.function.stringxmlagg;
+	exports com.blazebit.persistence.impl.function.subquery;
+	exports com.blazebit.persistence.impl.function.tomultiset;
+	exports com.blazebit.persistence.impl.function.tostringjson;
+	exports com.blazebit.persistence.impl.function.tostringxml;
+	exports com.blazebit.persistence.impl.function.treat;
+	exports com.blazebit.persistence.impl.function.trunc;
+	exports com.blazebit.persistence.impl.function.trunc.day;
+	exports com.blazebit.persistence.impl.function.trunc.hour;
+	exports com.blazebit.persistence.impl.function.trunc.microseconds;
+	exports com.blazebit.persistence.impl.function.trunc.milliseconds;
+	exports com.blazebit.persistence.impl.function.trunc.minute;
+	exports com.blazebit.persistence.impl.function.trunc.month;
+	exports com.blazebit.persistence.impl.function.trunc.quarter;
+	exports com.blazebit.persistence.impl.function.trunc.second;
+	exports com.blazebit.persistence.impl.function.trunc.week;
+	exports com.blazebit.persistence.impl.function.trunc.year;
+	exports com.blazebit.persistence.impl.function.window;
+	exports com.blazebit.persistence.impl.function.window.avg;
+	exports com.blazebit.persistence.impl.function.window.count;
+	exports com.blazebit.persistence.impl.function.window.cumedist;
+	exports com.blazebit.persistence.impl.function.window.denserank;
+	exports com.blazebit.persistence.impl.function.window.every;
+	exports com.blazebit.persistence.impl.function.window.first;
+	exports com.blazebit.persistence.impl.function.window.groupconcat;
+	exports com.blazebit.persistence.impl.function.window.lag;
+	exports com.blazebit.persistence.impl.function.window.last;
+	exports com.blazebit.persistence.impl.function.window.lead;
+	exports com.blazebit.persistence.impl.function.window.max;
+	exports com.blazebit.persistence.impl.function.window.min;
+	exports com.blazebit.persistence.impl.function.window.nth;
+	exports com.blazebit.persistence.impl.function.window.ntile;
+	exports com.blazebit.persistence.impl.function.window.oragg;
+	exports com.blazebit.persistence.impl.function.window.percentrank;
+	exports com.blazebit.persistence.impl.function.window.rank;
+	exports com.blazebit.persistence.impl.function.window.row;
+	exports com.blazebit.persistence.impl.function.window.sum;
+	exports com.blazebit.persistence.impl.keyset;
+	exports com.blazebit.persistence.impl.plan;
+	exports com.blazebit.persistence.impl.query;
+	exports com.blazebit.persistence.impl.transform;
+	exports com.blazebit.persistence.impl.util;
+	opens com.blazebit.persistence.impl.function.entity to org.hibernate.orm.core, eclipselink;
+	uses com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
+	uses com.blazebit.persistence.spi.ExtendedQuerySupport;
+	uses com.blazebit.persistence.spi.CriteriaBuilderConfigurationContributor;
+	provides com.blazebit.persistence.spi.CriteriaBuilderConfigurationProvider with com.blazebit.persistence.impl.CriteriaBuilderConfigurationProviderImpl;
+}
\ No newline at end of file
diff --git a/core/impl/src/main/java9/com/blazebit/persistence/impl/CallerChecker.java b/core/impl/src/main/java9/com/blazebit/persistence/impl/CallerChecker.java
deleted file mode 100644
index d1214d0199..0000000000
--- a/core/impl/src/main/java9/com/blazebit/persistence/impl/CallerChecker.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.impl;
-
-import java.util.Set;
-
-/**
- * A contract that checks if the caller of our caller is trusted. On Java 9 this will actually check modules.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-class CallerChecker {
-
-    private CallerChecker() {
-    }
-
-    public static boolean isCallerTrusted() {
-        return StackWalker.getInstance(Set.of(), 2).walk(stackFrames -> {
-            return stackFrames.limit(2).allMatch(s -> s.getClassName().startsWith("com.blazebit.persistence."));
-        });
-    }
-}
diff --git a/core/impl/src/main/resources/META-INF/MANIFEST.MF b/core/impl/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e714012cef..0000000000
--- a/core/impl/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Multi-Release: true
diff --git a/core/parser-jakarta/pom.xml b/core/parser-jakarta/pom.xml
deleted file mode 100644
index d0e8905dcb..0000000000
--- a/core/parser-jakarta/pom.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core.parser</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-core-parser:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-parser:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-parser:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/parser-jar/pom.xml b/core/parser-jar/pom.xml
deleted file mode 100644
index 81b6bc42da..0000000000
--- a/core/parser-jar/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-parser-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core.parser</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-core-parser</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-core-parser</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/parser/pom.xml b/core/parser/pom.xml
index c75426bbf2..5e9c03c1bd 100644
--- a/core/parser/pom.xml
+++ b/core/parser/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,10 +24,9 @@
     </properties>
 
     <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -41,7 +40,7 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.7.2</version>
+            <version>4.13.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>org.abego.treelayout.core</artifactId>
@@ -96,7 +95,7 @@
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.7.2</version>
+                <version>4.13.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -128,36 +127,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.parser;
-                                        exports com.blazebit.persistence.parser.expression;
-                                        exports com.blazebit.persistence.parser.expression.modifier;
-                                        exports com.blazebit.persistence.parser.predicate;
-                                        exports com.blazebit.persistence.parser.util;
-                                        uses com.blazebit.persistence.parser.util.TypeConverterContributor;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     
     </build>
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/EntityMetamodel.java b/core/parser/src/main/java/com/blazebit/persistence/parser/EntityMetamodel.java
index 1da5b578c9..2a9bd6a0de 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/EntityMetamodel.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/EntityMetamodel.java
@@ -5,16 +5,16 @@
 
 package com.blazebit.persistence.parser;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Type;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * This is a wrapper around the JPA {@link javax.persistence.metamodel.Metamodel} that allows additionally efficient access by other attributes than a Class.
+ * This is a wrapper around the JPA {@link jakarta.persistence.metamodel.Metamodel} that allows additionally efficient access by other attributes than a Class.
  *
  * @author Christian Beikov
  * @since 1.2.0
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/ListIndexAttribute.java b/core/parser/src/main/java/com/blazebit/persistence/parser/ListIndexAttribute.java
index c0a467c8ae..8f407f5ef6 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/ListIndexAttribute.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/ListIndexAttribute.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.parser;
 
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Member;
 
 /**
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/MapEntryAttribute.java b/core/parser/src/main/java/com/blazebit/persistence/parser/MapEntryAttribute.java
index 87b2b2e156..62032514fd 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/MapEntryAttribute.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/MapEntryAttribute.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.parser;
 
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Member;
 import java.util.Map;
 
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/MapKeyAttribute.java b/core/parser/src/main/java/com/blazebit/persistence/parser/MapKeyAttribute.java
index 28c282e4b4..a23aa7baec 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/MapKeyAttribute.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/MapKeyAttribute.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.parser;
 
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Member;
 
 /**
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/PathTargetResolvingExpressionVisitor.java b/core/parser/src/main/java/com/blazebit/persistence/parser/PathTargetResolvingExpressionVisitor.java
index d2128295f7..9771c300d9 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/PathTargetResolvingExpressionVisitor.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/PathTargetResolvingExpressionVisitor.java
@@ -50,14 +50,14 @@
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -200,7 +200,8 @@ private Type<?> getType(Type<?> baseType, Attribute<?, ?> attribute) {
         }
 
         Class<?> baseClass = baseType.getJavaType();
-        if (baseClass != null) {
+        // Hibernate ORM 6+ returns Map.class instead of null for map based entities
+        if (baseClass != null && baseClass != Map.class) {
             Class<?> clazz = JpaMetamodelUtils.resolveFieldClass(baseType.getJavaType(), attribute);
             if (clazz != null) {
                 return metamodel.type(clazz);
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/QualifiedAttribute.java b/core/parser/src/main/java/com/blazebit/persistence/parser/QualifiedAttribute.java
index 91387ebd99..11ab5d7023 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/QualifiedAttribute.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/QualifiedAttribute.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.parser;
 
-import javax.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
 
 /**
  * Super type for attributes like KEY/VALUE/ENTRY/INDEX
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/expression/PathReference.java b/core/parser/src/main/java/com/blazebit/persistence/parser/expression/PathReference.java
index 208cb2fcfe..98cc5c307a 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/expression/PathReference.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/expression/PathReference.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.parser.expression;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * TODO: documentation
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/util/JpaMetamodelUtils.java b/core/parser/src/main/java/com/blazebit/persistence/parser/util/JpaMetamodelUtils.java
index 4c0ad02466..db9731db0f 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/util/JpaMetamodelUtils.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/util/JpaMetamodelUtils.java
@@ -8,15 +8,15 @@
 import com.blazebit.persistence.parser.EntityMetamodel;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -322,16 +322,23 @@ public static Class<?> resolveFieldClass(Class<?> baseClass, Attribute<?, ?> att
              * with the corresponding primitive type.
              * Note that it also returns just "any" type of an id class attribute in case there is no dedicated id class type.
              */
-            if (entityType.getIdType() != null) {
-                final Class<?> primitiveIdClass = ReflectionUtils.getPrimitiveClassOfWrapper(entityType.getIdType().getJavaType());
-                if (primitiveIdClass == null) {
-                    // Discover the identifier attributes like this instead for EclipseLink
-                    Set<SingularAttribute<?, ?>> idTypes = collectIdAttributes(entityType);
-                    if (!idTypes.isEmpty()) {
-                        return idTypes;
+            try {
+                if (entityType.getIdType() != null) {
+                    final Class<?> primitiveIdClass = ReflectionUtils.getPrimitiveClassOfWrapper(entityType.getIdType().getJavaType());
+                    if (primitiveIdClass == null) {
+                        // Discover the identifier attributes like this instead for EclipseLink
+                        Set<SingularAttribute<?, ?>> idTypes = collectIdAttributes(entityType);
+                        if (!idTypes.isEmpty()) {
+                            return idTypes;
+                        }
+                    } else {
+                        return Collections.<SingularAttribute<?, ?>>singleton(entityType.getId(primitiveIdClass));
                     }
-                } else {
-                    return Collections.<SingularAttribute<?, ?>>singleton(entityType.getId(primitiveIdClass));
+                }
+            } catch (IllegalArgumentException e2) {
+                // Try again on the super type. Eclipselink is a bit odd in this regard...
+                if (entityType.getSupertype() != null) {
+                    return getIdAttributes(entityType.getSupertype());
                 }
             }
             throw e;
diff --git a/core/parser/src/main/java/com/blazebit/persistence/parser/util/TypeUtils.java b/core/parser/src/main/java/com/blazebit/persistence/parser/util/TypeUtils.java
index c3561eaf91..6dda4a5a45 100644
--- a/core/parser/src/main/java/com/blazebit/persistence/parser/util/TypeUtils.java
+++ b/core/parser/src/main/java/com/blazebit/persistence/parser/util/TypeUtils.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.parser.EntityMetamodel;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/core/parser/src/main/java/module-info.java b/core/parser/src/main/java/module-info.java
new file mode 100644
index 0000000000..7ef4fd53f2
--- /dev/null
+++ b/core/parser/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.core.parser {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires com.blazebit.common.utils;
+	requires org.antlr.antlr4.runtime;
+	exports com.blazebit.persistence.parser;
+	exports com.blazebit.persistence.parser.expression;
+	exports com.blazebit.persistence.parser.expression.modifier;
+	exports com.blazebit.persistence.parser.predicate;
+	exports com.blazebit.persistence.parser.util;
+	uses com.blazebit.persistence.parser.util.TypeConverterContributor;
+}
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index ac36c503af..e42c848b73 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -24,55 +24,6 @@
         <module>parser</module>
         <module>impl</module>
         <module>testsuite</module>
-
-        <module>api-jar</module>
-        <module>impl-jar</module>
-        <module>parser-jar</module>
-
-        <module>api-jakarta</module>
-        <module>parser-jakarta</module>
-        <module>impl-jakarta</module>
+        <module>testsuite-hibernate</module>
     </modules>
-    <profiles>
-        <profile>
-            <id>jakarta</id>
-            <modules>
-                <module>api</module>
-                <module>parser</module>
-                <module>impl</module>
-                <module>testsuite</module>
-                <module>testsuite-hibernate6</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-                <module>parser-jar</module>
-
-                <module>api-jakarta</module>
-                <module>parser-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <modules>
-                <module>api</module>
-                <module>parser</module>
-                <module>impl</module>
-                <module>testsuite</module>
-                <module>testsuite-hibernate6</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-                <module>parser-jar</module>
-
-                <module>api-jakarta</module>
-                <module>parser-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/testsuite-jakarta-runner/pom.xml b/core/testsuite-hibernate/pom.xml
similarity index 58%
rename from core/testsuite-jakarta-runner/pom.xml
rename to core/testsuite-hibernate/pom.xml
index b66c6c098e..0914275eff 100644
--- a/core/testsuite-jakarta-runner/pom.xml
+++ b/core/testsuite-hibernate/pom.xml
@@ -1,60 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>blaze-persistence-core-testsuite-jakarta-runner</artifactId>
+    <artifactId>blaze-persistence-core-testsuite-hibernate</artifactId>
     <packaging>jar</packaging>
 
     <properties>
-        <module.name>com.blazebit.persistence.core.testsuite</module.name>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <jpa-api-version>${version.jakarta-jpa-api}</jpa-api-version>
-        <version.h2>${h2-2.version}</version.h2>
-        <testBasePackage>com.blazebit.persistence.testsuite</testBasePackage>
-        <surefireForkCount>2</surefireForkCount>
-        <test>CoreTestsuite*</test>
+        <module.name>com.blazebit.persistence.core.testsuite.hibernate</module.name>
+        <testBasePackage>com.blazebit.persistence.testsuite.hibernate</testBasePackage>
+        <surefireForkCount>0</surefireForkCount>
     </properties>
 
     <dependencies>
+
+        <!-- Test dependencies -->
+
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
+            <artifactId>blaze-persistence-core-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${jpa-api-version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
+            <artifactId>blaze-persistence-core-testsuite</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <profiles>
+        <!-- RDBMS profiles -->
         <profile>
             <id>h2</id>
             <activation>
@@ -70,20 +68,19 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
                                 <jdbc.user>admin</jdbc.user>
                                 <jdbc.password>admin</jdbc.password>
                                 <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
+                                <user.country>US</user.country>
+                                <user.language>en</user.language>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -99,7 +96,7 @@
                 <dependency>
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
-                    <version>${version.h2}</version>
+                    <version>${h2.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -116,67 +113,18 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
                                 <jdbc.user>root</jdbc.user>
                                 <jdbc.password />
                                 <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
                                 <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -207,21 +155,18 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
                                 <jdbc.user>postgres</jdbc.user>
                                 <jdbc.password>postgres</jdbc.password>
                                 <jdbc.driver>org.postgresql.Driver</jdbc.driver>
                                 <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -241,45 +186,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>db2</id>
             <build>
@@ -292,21 +198,18 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:db2://${dbHost}:50000/test</jdbc.url>
                                 <jdbc.user>db2inst1</jdbc.user>
                                 <jdbc.password>db2inst1-pwd</jdbc.password>
                                 <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
                                 <jdbc.schema>core${surefire.forkNumber}</jdbc.schema>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -327,45 +230,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>oracle</id>
             <build>
@@ -378,6 +242,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
@@ -391,14 +256,10 @@
                                 <!-- Dumb, dumber, Oracle -->
                                 <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
                                 <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -430,21 +291,18 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
                                 <jdbc.user>sa</jdbc.user>
                                 <jdbc.password>Blaze-Persistence</jdbc.password>
                                 <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
                                 <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
                                 <testBasePackage>${testBasePackage}</testBasePackage>
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
                             </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -465,11 +323,11 @@
             </dependencies>
         </profile>
 
+        <!-- JPA provider profiles -->
         <profile>
             <id>hibernate-6.2</id>
             <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
@@ -490,22 +348,22 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.transaction</groupId>
                     <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -526,74 +384,55 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
             <id>hibernate-6.4</id>
             <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
@@ -614,22 +453,22 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.transaction</groupId>
                     <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -650,74 +489,54 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
             <id>hibernate-6.6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
@@ -738,22 +557,22 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.transaction</groupId>
                     <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -774,7 +593,76 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <!-- No need to run this with the APT profile -->
+            <id>hibernate-apt</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                            <skipMain>true</skipMain>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <!-- No need to run this with EclipseLink -->
+            <id>eclipselink</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                            <skipMain>true</skipMain>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
-
 </project>
diff --git a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/IntegerProperty.java b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/IntegerProperty.java
similarity index 93%
rename from core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/IntegerProperty.java
rename to core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/IntegerProperty.java
index fb1590cbb2..80b894d573 100644
--- a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/IntegerProperty.java
+++ b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/IntegerProperty.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Blazebit
  */
-package com.blazebit.persistence.testsuite.hibernate6.entity;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/Property.java b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/Property.java
similarity index 69%
rename from core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/Property.java
rename to core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/Property.java
index 0642001176..f09bf115ff 100644
--- a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/Property.java
+++ b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/Property.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Blazebit
  */
-package com.blazebit.persistence.testsuite.hibernate6.entity;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 public interface Property<T> {
 
diff --git a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/PropertyHolder.java b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/PropertyHolder.java
similarity index 95%
rename from core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/PropertyHolder.java
rename to core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/PropertyHolder.java
index ce28991a94..2a0fa10966 100644
--- a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/PropertyHolder.java
+++ b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/PropertyHolder.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Blazebit
  */
-package com.blazebit.persistence.testsuite.hibernate6.entity;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorType;
diff --git a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/StringProperty.java b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/StringProperty.java
similarity index 93%
rename from core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/StringProperty.java
rename to core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/StringProperty.java
index 232b1b7fbc..fc98840bd5 100644
--- a/core/testsuite-hibernate6/src/main/java/com/blazebit/persistence/testsuite/hibernate6/entity/StringProperty.java
+++ b/core/testsuite-hibernate/src/main/java/com/blazebit/persistence/testsuite/hibernate/entity/StringProperty.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Blazebit
  */
-package com.blazebit.persistence.testsuite.hibernate6.entity;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/testsuite-hibernate6/src/test/java/com/blazebit/persistence/testsuite/hibernate6/AnyMappingTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/AnyMappingTest.java
similarity index 83%
rename from core/testsuite-hibernate6/src/test/java/com/blazebit/persistence/testsuite/hibernate6/AnyMappingTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/AnyMappingTest.java
index 2b57a6d64e..f9a6e80c1e 100644
--- a/core/testsuite-hibernate6/src/test/java/com/blazebit/persistence/testsuite/hibernate6/AnyMappingTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/AnyMappingTest.java
@@ -2,11 +2,11 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Blazebit
  */
-package com.blazebit.persistence.testsuite.hibernate6;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.hibernate6.entity.PropertyHolder;
+import com.blazebit.persistence.testsuite.hibernate.entity.PropertyHolder;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CTESubselectFilteringTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CTESubselectFilteringTest.java
similarity index 90%
rename from core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CTESubselectFilteringTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CTESubselectFilteringTest.java
index c125f1d01b..42d014b3ed 100644
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CTESubselectFilteringTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CTESubselectFilteringTest.java
@@ -3,9 +3,10 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CTE;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -19,15 +20,15 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
 import java.util.List;
 
 import static org.hibernate.Hibernate.initialize;
@@ -148,7 +149,7 @@ public static class NodeCTE {
 
     @Entity(name = "Node")
     @FilterDef(name = "NodeFilter", defaultCondition = "filtering_value = :mySuperValue", parameters = {
-            @ParamDef(name = "mySuperValue", type = "boolean")
+            @ParamDef(name = "mySuperValue", type = Boolean.class)
     })
     public static class Node {
 
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/CollectionJoinTestHibernate.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CollectionJoinTestHibernate.java
similarity index 92%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/CollectionJoinTestHibernate.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CollectionJoinTestHibernate.java
index 2712e79088..7383714013 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/CollectionJoinTestHibernate.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CollectionJoinTestHibernate.java
@@ -3,9 +3,10 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.entity.*;
 import org.junit.Test;
 
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomFunctionTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java
similarity index 61%
rename from core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomFunctionTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java
index 92151d51b1..0ff56e05fe 100644
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomFunctionTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java
@@ -4,26 +4,30 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
+
+import java.util.Properties;
+
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.query.sqm.function.SqmFunctionRegistry;
+import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
+import org.hibernate.type.BasicType;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 import com.blazebit.persistence.spi.JpqlFunctionGroup;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.type.LongType;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.util.Properties;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 /**
  * @author Jan-Willem Gmelig Meyling
@@ -43,7 +47,7 @@ public static class BasicEntity {
     }
 
     @Test
-    @Category({NoMSSQL.class, NoMySQL.class, NoMySQLOld.class, NoPostgreSQL.class, NoOracle.class, NoDB2.class})
+    @Category({NoMSSQL.class, NoMySQL.class, NoPostgreSQL.class, NoOracle.class, NoDB2.class})
     public void implicitJoinCustomAggregateFunction() {
         String queryString = cbf.create(em, BasicEntity.class, "b")
                 .select("addone(b.id)")
@@ -69,9 +73,17 @@ protected Properties applyProperties(Properties properties) {
     }
 
     public static class ExtendedDialect extends H2Dialect {
-        public ExtendedDialect() {
-            registerFunction("ADDONE", new SQLFunctionTemplate(LongType.INSTANCE, "?1 + 1"));
-            registerFunction("CUSTOMSUM", new SQLFunctionTemplate(LongType.INSTANCE, "SUM(?1)"));
+        @Override
+        public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+            super.initializeFunctionRegistry( functionContributions );
+            SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
+            BasicType<Long> longType = functionContributions.getTypeConfiguration().getBasicTypeForJavaType(Long.class);
+            functionRegistry.patternDescriptorBuilder("ADDONE", "?1 + 1")
+                    .setReturnTypeResolver(StandardFunctionReturnTypeResolvers.invariant(longType))
+                    .register();
+            functionRegistry.patternDescriptorBuilder("CUSTOMSUM", "SUM(?1)")
+                    .setReturnTypeResolver(StandardFunctionReturnTypeResolvers.invariant(longType))
+                    .register();
         }
     }
 
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java
similarity index 85%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java
index 31cd614e94..7d2ccca3a6 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java
@@ -3,29 +3,25 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53;
-import org.hibernate.annotations.ForeignKey;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Tuple;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Tuple;
 import java.util.List;
 import java.util.Properties;
 
@@ -68,10 +64,6 @@ public void setUp() {
     }
 
     @Test
-    @Category({
-            // Although unused, this test dependent on the availability of group join support introduced in Hibernate 5.2.8
-            NoHibernate42.class, NoHibernate43.class, NoHibernate51.class
-    })
     public void testRootTypeJoinWithGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -110,10 +102,6 @@ public void testRootTypeJoinWithGroupJoins() {
     }
 
     @Test
-    @Category({
-            NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback
-            NoHibernate52.class, NoHibernate53.class // Optimize with group joins instead
-    })
     public void testRootTypeJoinWithoutGroupJoins() {
         Assume.assumeFalse(supportsTableGroupJoins());
 
@@ -166,10 +154,6 @@ public void testRootTypeJoinWithoutGroupJoins() {
     }
 
     @Test
-    @Category({
-            // This test requires group joins introduced in Hibernate 5.2.8
-            NoHibernate42.class, NoHibernate43.class, NoHibernate51.class
-    })
     public void testSubTypeJoinWithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -208,10 +192,6 @@ public void testSubTypeJoinWithTableGroupJoins() {
     }
 
     @Test
-    @Category({
-            NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback
-            NoHibernate52.class, NoHibernate53.class // Optimize with group joins instead
-    })
     public void testSubTypeJoinWithoutTableGroupJoins() {
         Assume.assumeFalse(supportsTableGroupJoins());
         Assume.assumeTrue(jpaProvider.supportsEntityJoin());
@@ -266,7 +246,7 @@ public static class Super<SubType extends Super> {
         @Column
         Long id;
 
-        @ForeignKey(name = "none")
+        @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
         @ManyToOne(targetEntity = Super.class, fetch = FetchType.LAZY)
         SubType parent;
 
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EmbeddableIdComplexTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdComplexTest.java
similarity index 91%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EmbeddableIdComplexTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdComplexTest.java
index c1ffbb246e..7f344a0caa 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EmbeddableIdComplexTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdComplexTest.java
@@ -3,14 +3,15 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import com.blazebit.persistence.testsuite.hibernate.EmbeddableIdTestEntity;
+import com.blazebit.persistence.testsuite.hibernate.entity.EmbeddableIdTestEntity;
 import org.junit.Test;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EnversTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java
similarity index 73%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EnversTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java
index 2f4e4bd603..13562287d9 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/EnversTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java
@@ -3,26 +3,25 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import org.hibernate.envers.Audited;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.metamodel.EntityType;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.envers.Audited;
+
+import org.junit.Test;
+
+import com.blazebit.persistence.parser.EntityMetamodel;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.metamodel.EntityType;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -38,10 +37,7 @@ protected Class<?>[] getEntityClasses() {
         return new Class<?>[]{ A.class };
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 do very strange things to the JPA entity name and also register the audited entities only via the FQN + _AUD
-    // At some point we might fix that in the JoinManager to output compatible HQL, but for now, we just ignore it
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class })
     public void selectEnversEntity() {
         EntityMetamodel metamodel = cbf.getService(EntityMetamodel.class);
         EntityType<?> auditedEntity = getAuditedEntity(metamodel, A.class);
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/FullJoinTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java
similarity index 91%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/FullJoinTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java
index 470b960e00..f1efa29584 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/FullJoinTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java
@@ -3,30 +3,27 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
+
+import java.util.List;
 
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.JoinType;
-import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Tuple;
-import java.util.List;
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.JoinType;
+import com.blazebit.persistence.PaginatedCriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -38,7 +35,7 @@
  * @author Jan-Willem Gmelig Meyling
  * @since 1.4.0
  */
-@Category({NoH2.class, NoMySQL.class, NoMySQLOld.class, NoHibernate.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class})
+@Category({NoH2.class, NoMySQL.class})
 public class FullJoinTest extends AbstractCoreTest {
 
     @Before
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/IgnoreNotFoundDereferenceTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/IgnoreNotFoundDereferenceTest.java
similarity index 80%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/IgnoreNotFoundDereferenceTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/IgnoreNotFoundDereferenceTest.java
index 8db53a5814..b2da63fc17 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/IgnoreNotFoundDereferenceTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/IgnoreNotFoundDereferenceTest.java
@@ -3,17 +3,18 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import org.junit.Test;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Jan-Willem Gmelig Meyling
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1000Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java
similarity index 73%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1000Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java
index 4882e55770..09434975ac 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1000Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java
@@ -3,26 +3,23 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
+
+import org.junit.Test;
 
 import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.entity.LongSequenceEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 /**
  * @author Jan-Willem Gmelig Meyling
  * @since 1.4.1
  */
-public class Issue1000Test extends AbstractCoreTest  {
+public class Issue1000Test extends AbstractCoreTest {
 
     @Override
     protected Class<?>[] getEntityClasses() {
@@ -44,9 +41,6 @@ public static class CorrelatedTimer extends LongSequenceEntity {}
     public static class Timer extends LongSequenceEntity {}
 
     @Test
-    @Category({
-            NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback
-    })
     public void testCorrelation() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1154Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1154Test.java
similarity index 72%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1154Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1154Test.java
index d0c8735cff..8df6e376e1 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1154Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1154Test.java
@@ -3,25 +3,18 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.hibernate.annotations.Generated;
-import org.hibernate.annotations.GenerationTime;
-import org.hibernate.annotations.Subselect;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+
 import org.junit.Ignore;
 import org.junit.Test;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import java.util.List;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1167Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1167Test.java
similarity index 75%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1167Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1167Test.java
index c39cfeaff4..36ede7974f 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1167Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1167Test.java
@@ -3,15 +3,16 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import org.hibernate.annotations.Where;
 import org.junit.Test;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Christian Beikov
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1436Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1436Test.java
similarity index 85%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1436Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1436Test.java
index cccd6195d8..0e23cfc5ce 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1436Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1436Test.java
@@ -3,16 +3,17 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.parser.EntityMetamodel;
 import com.blazebit.persistence.spi.ExtendedAttribute;
 import com.blazebit.persistence.spi.ExtendedManagedType;
 import org.junit.Test;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1704Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java
similarity index 69%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1704Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java
index 8b83111893..257a1a7377 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1704Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java
@@ -3,32 +3,28 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.hibernate.annotations.Where;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Tuple;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.hibernate.annotations.Where;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Tuple;
+
 /**
  * @author Christian Beikov
  * @since 1.6.10
@@ -42,10 +38,7 @@ protected Class<?>[] getEntityClasses() {
         };
     }
 
-    // NOTE: Old MySQL do not support lateral joins
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     @Test
-    @Category({ NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class })
     public void testLateralLimit() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1713Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1713Test.java
similarity index 83%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1713Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1713Test.java
index 47ad7a4789..89320c5882 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue1713Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1713Test.java
@@ -3,9 +3,10 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CTE;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -13,10 +14,10 @@
 import com.blazebit.persistence.testsuite.entity.Version;
 import org.junit.Test;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrimaryKeyJoinColumn;
 
 /**
  * @author Christian Beikov
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue227Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue227Test.java
similarity index 93%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue227Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue227Test.java
index e45904b5c5..9388dc0b8f 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue227Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue227Test.java
@@ -3,10 +3,11 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CTE;
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -17,18 +18,18 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue336HibernateTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue336HibernateTest.java
similarity index 86%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue336HibernateTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue336HibernateTest.java
index 8435271502..4de2f9e4f9 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue336HibernateTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue336HibernateTest.java
@@ -3,21 +3,22 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.hibernate.annotations.Formula;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.List;
 
 /**
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue519Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue519Test.java
similarity index 86%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue519Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue519Test.java
index dfc428b717..141c5e27c7 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue519Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue519Test.java
@@ -3,22 +3,23 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.GenerationTime;
 import org.hibernate.annotations.Subselect;
 import org.junit.Test;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Table;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue546Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue546Test.java
similarity index 78%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue546Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue546Test.java
index affc1a1406..f41f81ba5a 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue546Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue546Test.java
@@ -3,21 +3,21 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
+
 import org.hibernate.annotations.Formula;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.PersistenceException;
-import javax.persistence.Table;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Table;
 
 /**
  * @author Christian beikov
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue666Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue666Test.java
similarity index 86%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue666Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue666Test.java
index 70b2b0b2df..2aa8d14c76 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue666Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue666Test.java
@@ -3,19 +3,20 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.ManyToOne;
-import javax.persistence.Tuple;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Tuple;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue950Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java
similarity index 91%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue950Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java
index dbf7612036..4af1e58006 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue950Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java
@@ -3,30 +3,25 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Tuple;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -164,9 +159,7 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Requires Entity joins
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testJoinOrderWithRightJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -206,7 +199,7 @@ public void work(EntityManager em) {
 
     // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class })
+    @Category({ NoHibernate.class })
     public void testJoinOrderWithRightNormalJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -244,9 +237,7 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Requires Entity joins
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testJoinOrderWithRightJoinWithIdDereference() {
         transactional(new TxVoidWork() {
             @Override
@@ -295,7 +286,7 @@ public void work(EntityManager em) {
 
     // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class })
+    @Category({ NoHibernate.class })
     public void testJoinOrderWithRightNormalJoinWithIdDereference() {
         transactional(new TxVoidWork() {
             @Override
@@ -342,9 +333,7 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Requires Entity joins
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testJoinOrderWithRightJoinWithInnerImplicitJoins() {
         transactional(new TxVoidWork() {
             @Override
@@ -393,7 +382,7 @@ public void work(EntityManager em) {
 
     // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class })
+    @Category({ NoHibernate.class })
     public void testJoinOrderWithRightNormalJoinWithInnerImplicitJoins() {
         transactional(new TxVoidWork() {
             @Override
@@ -440,9 +429,7 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Requires Entity joins
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testJoinOrderWithRightJoinWithNonOptionalAssociationProjections() {
         transactional(new TxVoidWork() {
             @Override
@@ -486,7 +473,7 @@ public void work(EntityManager em) {
 
     // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class })
+    @Category({ NoHibernate.class })
     public void testJoinOrderWithRightNormalJoinWithNonOptionalAssociationProjections() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue969Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue969Test.java
similarity index 88%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue969Test.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue969Test.java
index e2de006d04..221ea9afea 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/Issue969Test.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue969Test.java
@@ -3,14 +3,15 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import org.junit.Test;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.ManyToOne;
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/QuotedIdentifiersTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/QuotedIdentifiersTest.java
similarity index 88%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/QuotedIdentifiersTest.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/QuotedIdentifiersTest.java
index 33ad8f4b20..133ba1d934 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/QuotedIdentifiersTest.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/QuotedIdentifiersTest.java
@@ -3,13 +3,15 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite;
+package com.blazebit.persistence.testsuite.hibernate;
 
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Properties;
 
+import com.blazebit.persistence.testsuite.AbstractCoreTest;
+
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntity.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntity.java
similarity index 80%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntity.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntity.java
index fa6ab7ab5e..ef13c83d98 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntity.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntity.java
@@ -3,12 +3,12 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite.hibernate;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
-import javax.persistence.Embedded;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityEmbeddable.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityEmbeddable.java
similarity index 97%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityEmbeddable.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityEmbeddable.java
index 6a82edcfe9..9612bb228b 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityEmbeddable.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityEmbeddable.java
@@ -3,12 +3,12 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite.hibernate;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityId.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityId.java
similarity index 96%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityId.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityId.java
index 34708ba9ac..cc9f9449cb 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityId.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityId.java
@@ -3,12 +3,12 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite.hibernate;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityIdEmbeddable;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityNestedEmbeddable.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityNestedEmbeddable.java
similarity index 87%
rename from core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityNestedEmbeddable.java
rename to core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityNestedEmbeddable.java
index 6aa4c1e378..f259154c56 100644
--- a/core/testsuite/src/test/hibernate/com/blazebit/persistence/testsuite/hibernate/EmbeddableIdTestEntityNestedEmbeddable.java
+++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/entity/EmbeddableIdTestEntityNestedEmbeddable.java
@@ -3,12 +3,12 @@
  * Copyright Blazebit
  */
 
-package com.blazebit.persistence.testsuite.hibernate;
+package com.blazebit.persistence.testsuite.hibernate.entity;
 
-import javax.persistence.Embeddable;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/logging.properties b/core/testsuite-hibernate/src/test/resources/logging.properties
similarity index 95%
rename from integration/spring-hateoas/webmvc-jakarta/src/test/resources/logging.properties
rename to core/testsuite-hibernate/src/test/resources/logging.properties
index f4f9a66aa9..f307bc07b8 100644
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/logging.properties
+++ b/core/testsuite-hibernate/src/test/resources/logging.properties
@@ -20,6 +20,7 @@ handlers = java.util.logging.ConsoleHandler
 # We turn it off for TravisCI build with SEVERE
 org.hibernate.level = SEVERE
 org.hibernate.tool.hbm2ddl.level = OFF
+org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl.level = ALL
 #org.hibernate.SQL.level = ALL
 #org.hibernate.type.descriptor.sql.level = ALL
 #org.hibernate.tool.hbm2ddl.level = ALL
diff --git a/core/testsuite-hibernate6/pom.xml b/core/testsuite-hibernate6/pom.xml
deleted file mode 100644
index 3afd63f793..0000000000
--- a/core/testsuite-hibernate6/pom.xml
+++ /dev/null
@@ -1,842 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-testsuite-hibernate6</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>11</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <module.name>com.blazebit.persistence.view.testsuite.hibernate6</module.name>
-        <jpa-api-version>${version.jakarta-jpa-api}</jpa-api-version>
-        <version.h2>${h2-2.version}</version.h2>
-        <testBasePackage>com.blazebit.persistence.testsuite</testBasePackage>
-        <surefireForkCount>0</surefireForkCount>
-    </properties>
-
-    <dependencies>
-
-        <!-- Test dependencies -->
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>${version.h2}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://${dbHost}:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <jdbc.schema>core${surefire.forkNumber}</jdbc.schema>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>jcc</artifactId>
-                    <version>11.5.5.0</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
-                                <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>Oracle18</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <jdbc.schema>C##CORE${surefire.forkNumber}</jdbc.schema>
-                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
-                                <user.country>US</user.country>
-                                <user.language>en</user.language>
-                                <user.timezone>UTC</user.timezone>
-                                <!-- Dumb, dumber, Oracle -->
-                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
-                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ojdbc8</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
-                                <jdbc.user>sa</jdbc.user>
-                                <jdbc.password>Blaze-Persistence</jdbc.password>
-                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-core-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.microsoft.sqlserver</groupId>
-                    <artifactId>mssql-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <!-- Note that we use version 6.2 here because this profile will be used during the release, which needs an ORM version for compilation -->
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                    <version>${version.jakarta-jpa-3.1-api}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>
diff --git a/core/testsuite-jakarta/pom.xml b/core/testsuite-jakarta/pom.xml
deleted file mode 100644
index 26973e6abc..0000000000
--- a/core/testsuite-jakarta/pom.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.core.testsuite</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- If new integrations arrive, we can use profiles -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-
-        <!-- Add mockito early to the local maven repo since the Hibernate,DB2 build froze on downloading this dependency -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-assertion</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-core-testsuite:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-testsuite:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-testsuite:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-core-testsuite:jar}" regexp="\.jar$" replace="-tests.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-tests.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                    <classifier>tests</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                            <classifier>tests</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/testsuite/pom.xml b/core/testsuite/pom.xml
index 26e4ddad33..d4a495b336 100644
--- a/core/testsuite/pom.xml
+++ b/core/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,16 +20,39 @@
     <name>Blazebit Persistence Core Testsuite</name>
 
     <properties>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
         <module.name>com.blazebit.persistence.core.testsuite</module.name>
         <testBasePackage>com.blazebit.persistence.testsuite</testBasePackage>
         <surefireForkCount>2</surefireForkCount>
         <test>CoreTestsuite*</test>
+        <useModulePath>true</useModulePath>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
 
@@ -47,6 +70,11 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
@@ -65,7 +93,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -80,7 +107,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -94,44 +120,31 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.activation}</version>
+            <version>${version.activation-api}</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>add-module-info</goal>
+                            <goal>add-source</goal>
                         </goals>
                         <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    open module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.core.parser;
-                                        requires com.blazebit.persistence.core.impl;
-                                        exports com.blazebit.persistence.testsuite;
-                                        exports com.blazebit.persistence.testsuite.entity;
-                                        exports com.blazebit.persistence.testsuite.treat.entity;
-                                        exports com.blazebit.persistence.testsuite.tx;
-                                    }
-                                </moduleInfoSource>
-                            </module>
+                            <sources>
+                                <source>${additional.source.directory}</source>
+                            </sources>
                         </configuration>
                     </execution>
                 </executions>
@@ -156,6 +169,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
                                 <jdbc.user>admin</jdbc.user>
@@ -166,6 +180,8 @@
                                 <forkCount>${surefireForkCount}</forkCount>
                                 <fork>$${surefire.forkNumber}</fork>
                                 <user.timezone>UTC</user.timezone>
+                                <user.country>US</user.country>
+                                <user.language>en</user.language>
                             </systemPropertyVariables>
                         </configuration>
                         <dependencies>
@@ -176,25 +192,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -218,68 +215,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>core${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
                                 <jdbc.user>root</jdbc.user>
@@ -301,25 +237,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -341,6 +258,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
                                 <jdbc.user>postgres</jdbc.user>
@@ -362,25 +280,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -391,61 +290,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>db2</id>
             <build>
@@ -458,6 +302,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:db2://${dbHost}:50000/test</jdbc.url>
                                 <jdbc.user>db2inst1</jdbc.user>
@@ -479,25 +324,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -509,61 +335,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>oracle</id>
             <build>
@@ -576,6 +347,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
@@ -603,25 +375,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -644,6 +397,7 @@
                             <skip>${maven.test.skip}</skip>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
                                 <jdbc.user>sa</jdbc.user>
@@ -665,25 +419,6 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
             <dependencies>
@@ -697,2078 +432,338 @@
 
         <!-- JPA provider profiles -->
         <profile>
-            <id>hibernate</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
                 <additional.source.directory>src/main/hibernate</additional.source.directory>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-4</artifactId>
-                    <version>${version.hibernate-types}</version>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+                    <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
+                    <version>${version.hibernate-6.2}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-4.3</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64</jpa.excludedGroups>
                 <additional.source.directory>src/main/hibernate</additional.source.directory>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-43</artifactId>
-                    <version>${version.hibernate-types}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.0</id>
+            <id>hibernate-6.6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
                 <additional.source.directory>src/main/hibernate</additional.source.directory>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-5</artifactId>
-                    <version>${version.hibernate-types}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>eclipselink</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
+                <additional.source.directory>src/main/basic</additional.source.directory>
+                <!-- Looks like EclipseLink isn't really made for running in module mode -->
+                <useModulePath>false</useModulePath>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>eclipselink</artifactId>
+                    <version>${version.eclipselink}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
+                    <scope>compile</scope>
                 </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-5</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-55</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-55</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-52</artifactId>
-                    <version>${version.hibernate-types}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <additional.source.directory>src/main/basic</additional.source.directory>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
+                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
                     <groupId>org.eclipse.persistence</groupId>
                     <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
@@ -2779,755 +774,146 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <additional.source.directory>src/main/basic</additional.source.directory>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <additional.source.directory>src/main/basic</additional.source.directory>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/main/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>datanucleus-5.1</id>
+            <id>hibernate-apt</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <additional.source.directory>src/main/basic</additional.source.directory>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
+                <additional.source.directory>src/main/hibernate</additional.source.directory>
             </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
             <dependencies>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <additional.source.directory>src/main/basic</additional.source.directory>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <additional.source.directory>src/main/hibernate</additional.source.directory>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>com.vladmihalcea</groupId>
-                    <artifactId>hibernate-types-55</artifactId>
-                    <version>${version.hibernate-types}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-apt}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${additional.source.directory}</source>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-hibernate</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/hibernate</source>
-                                        <source>src/test/hibernateold</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <additionalSourceDirectories>
-                                        <additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
-                                    </additionalSourceDirectories>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/entity/Person.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/entity/Person.java
index 257bfa5042..1bf6aa5ed7 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/entity/Person.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/entity/Person.java
@@ -5,20 +5,20 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
index 27fee530e5..6455ed851b 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class JoinedEmbeddable implements BaseEmbeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
index 9a1e78a155..dddb9ba4c7 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class JoinedEmbeddableSub1 implements Sub1Embeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
index a517f17516..86685966f8 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class JoinedEmbeddableSub2 implements Sub2Embeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
index 38b2858676..dc2f0d7722 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class SingleTableEmbeddable implements BaseEmbeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
index 65eaf0bca0..22f19e12c9 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class SingleTableEmbeddableSub1 implements Sub1Embeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
index 140b74fe30..4e1cf8a0fb 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class SingleTableEmbeddableSub2 implements Sub2Embeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
index 2a72f884a6..c588cfe738 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
@@ -5,19 +5,19 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
index b8e42e0114..45000a7b91 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
@@ -12,17 +12,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class TablePerClassEmbeddable implements BaseEmbeddable<TablePerClassBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
index ce840b7392..241225de9c 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
@@ -12,17 +12,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class TablePerClassEmbeddableSub1 implements Sub1Embeddable<TablePerClassBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
index 6b922aae47..185da54819 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
@@ -12,17 +12,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Transient;
 
 @Embeddable
 public class TablePerClassEmbeddableSub2 implements Sub2Embeddable<TablePerClassBase>, Serializable {
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
index df64d92852..af2893270a 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
@@ -6,21 +6,21 @@
 package com.blazebit.persistence.testsuite.treat.entity;
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import javax.persistence.AssociationOverride;
-import javax.persistence.AssociationOverrides;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AssociationOverrides;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
index 02ff055417..953af97e2d 100644
--- a/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
+++ b/core/testsuite/src/main/basic/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
@@ -6,21 +6,21 @@
 package com.blazebit.persistence.testsuite.treat.entity;
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import javax.persistence.AssociationOverride;
-import javax.persistence.AssociationOverrides;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AssociationOverrides;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/entity/Person.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/entity/Person.java
index 860a2c2666..a2b1f2171a 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/entity/Person.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/entity/Person.java
@@ -5,19 +5,19 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
index 9f49e35aa2..28d251a31d 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddable.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class JoinedEmbeddable implements BaseEmbeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
index 4657f7b9c7..c7dbe8b577 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub1.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class JoinedEmbeddableSub1 implements Sub1Embeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
index 74c7710c11..67fe121709 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/JoinedEmbeddableSub2.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class JoinedEmbeddableSub2 implements Sub2Embeddable<JoinedBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
index 1c69d3b00e..e77bc1e5a7 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddable.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class SingleTableEmbeddable implements BaseEmbeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
index 9f35f2c6b0..80f2cf83e2 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub1.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class SingleTableEmbeddableSub1 implements Sub1Embeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
index 88509f4365..259d90ff97 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/SingleTableEmbeddableSub2.java
@@ -12,15 +12,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class SingleTableEmbeddableSub2 implements Sub2Embeddable<SingleTableBase>, Serializable {
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
index 1d8d259df4..5e0940a8b8 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassBase.java
@@ -5,22 +5,23 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import org.hibernate.annotations.ForeignKey;
-
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -87,7 +88,7 @@ public void setValue(Integer value) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY, optional = true)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @ForeignKey(name = "none")
+    @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getParent() {
         return parent;
     }
@@ -112,8 +113,7 @@ public void setEmbeddable(TablePerClassEmbeddable embeddable) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcb_list")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcb_list", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getList() {
         return list;
     }
@@ -126,8 +126,7 @@ public void setList(List<? extends TablePerClassBase> list) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcb_map")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcb_map", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpcb_map_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getMap() {
         return map;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
index 0e2bf6a41e..6a21294e27 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddable.java
@@ -5,8 +5,6 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import org.hibernate.annotations.ForeignKey;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,15 +12,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class TablePerClassEmbeddable implements BaseEmbeddable<TablePerClassBase>, Serializable {
@@ -43,8 +44,7 @@ public TablePerClassEmbeddable(TablePerClassBase parent) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinColumn(name = "embeddableParent")
-    @ForeignKey(name = "none")
+    @JoinColumn(name = "embeddableParent", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getParent() {
         return parent;
     }
@@ -70,8 +70,7 @@ public void setChildren(Set<? extends TablePerClassBase> children) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpce_list")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpce_list", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getList() {
         return list;
     }
@@ -84,8 +83,7 @@ public void setList(List<? extends TablePerClassBase> list) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpce_map")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpce_map", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpce_map_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getMap() {
         return map;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
index 269245dc66..b21c7f43c0 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub1.java
@@ -5,8 +5,6 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import org.hibernate.annotations.ForeignKey;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,15 +12,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class TablePerClassEmbeddableSub1 implements Sub1Embeddable<TablePerClassBase>, Serializable {
@@ -54,8 +55,7 @@ public void setSub1SomeValue(Integer sub1SomeValue) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinColumn(name = "embeddableSub1Parent")
-    @ForeignKey(name = "none")
+    @JoinColumn(name = "embeddableSub1Parent", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getSub1Parent() {
         return sub1Parent;
     }
@@ -81,8 +81,7 @@ public void setSub1Children(Set<? extends TablePerClassBase> sub1Children) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpces1_list")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpces1_list", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getSub1List() {
         return sub1List;
     }
@@ -95,8 +94,7 @@ public void setSub1List(List<? extends TablePerClassBase> sub1List) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpces1_map")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpces1_map", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpces1_map_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getSub1Map() {
         return sub1Map;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
index 34efae9f71..2fddefcf35 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassEmbeddableSub2.java
@@ -5,8 +5,6 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import org.hibernate.annotations.ForeignKey;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,15 +12,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 @Embeddable
 public class TablePerClassEmbeddableSub2 implements Sub2Embeddable<TablePerClassBase>, Serializable {
@@ -54,8 +55,7 @@ public void setSub2SomeValue(Integer sub2SomeValue) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinColumn(name = "embeddableSub2Parent")
-    @ForeignKey(name = "none")
+    @JoinColumn(name = "embeddableSub2Parent", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getSub2Parent() {
         return sub2Parent;
     }
@@ -81,8 +81,7 @@ public void setSub2Children(Set<? extends TablePerClassBase> sub2Children) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpces2_list")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpces2_list", foreignKey = @jakarta.persistence.ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @jakarta.persistence.ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getSub2List() {
         return sub2List;
     }
@@ -95,8 +94,7 @@ public void setSub2List(List<? extends TablePerClassBase> sub2List) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpces2_map")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpces2_map", foreignKey = @jakarta.persistence.ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @jakarta.persistence.ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpces2_map_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getSub2Map() {
         return sub2Map;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
index d7fa3b7ab2..14661e65e5 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub1.java
@@ -6,18 +6,20 @@
 package com.blazebit.persistence.testsuite.treat.entity;
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import org.hibernate.annotations.ForeignKey;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,7 +62,7 @@ public void setRelation1(IntIdEntity relation1) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @ForeignKey(name = "none")
+    @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getParent1() {
         return parent1;
     }
@@ -106,8 +108,7 @@ public void setEmbeddable1(TablePerClassEmbeddableSub1 embeddable1) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcs1_list1")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcs1_list1", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getList1() {
         return list1;
     }
@@ -131,8 +132,7 @@ public void setChildren1(Set<? extends TablePerClassBase> children1) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcs1_map1")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcs1_map1", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpcs1_map1_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getMap1() {
         return map1;
diff --git a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
index 6b7a53daba..eb37dfc926 100644
--- a/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
+++ b/core/testsuite/src/main/hibernate/com/blazebit/persistence/testsuite/treat/entity/TablePerClassSub2.java
@@ -6,18 +6,20 @@
 package com.blazebit.persistence.testsuite.treat.entity;
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import org.hibernate.annotations.ForeignKey;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,7 +62,7 @@ public void setRelation2(IntIdEntity relation2) {
     @Override
     @ManyToOne(fetch = FetchType.LAZY)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @ForeignKey(name = "none")
+    @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public TablePerClassBase getParent2() {
         return parent2;
     }
@@ -106,8 +108,7 @@ public void setEmbeddable2(TablePerClassEmbeddableSub2 embeddable2) {
     @ManyToMany
     @OrderColumn(name = "list_idx", nullable = false)
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcs2_list2")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcs2_list2", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     public List<TablePerClassBase> getList2() {
         return list2;
     }
@@ -131,8 +132,7 @@ public void setChildren2(Set<? extends TablePerClassBase> children2) {
     @Override
     @ManyToMany
     // We can't have a constraint in this case because we don't know the exact table this will refer to
-    @JoinTable(name = "tpcs2_map2")
-    @ForeignKey(name = "none", inverseName = "none")
+    @JoinTable(name = "tpcs2_map2", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @MapKeyColumn(name = "tpcs2_map2_key", nullable = false, length = 20)
     public Map<TablePerClassBase, TablePerClassBase> getMap2() {
         return map2;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/AbstractCoreTest.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/AbstractCoreTest.java
index 9a4ff43525..aa7bea953c 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/AbstractCoreTest.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/AbstractCoreTest.java
@@ -31,9 +31,9 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.testsuite.tx.TxWork;
 
-import javax.persistence.EntityManager;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/DelegatingDbmsDialect.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/DelegatingDbmsDialect.java
index ff4018262f..fb7b2c6dea 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/DelegatingDbmsDialect.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/DelegatingDbmsDialect.java
@@ -52,8 +52,8 @@ public boolean supportsNonRecursiveWithClause() {
     }
 
     @Override
-    public boolean supportsWithClauseHead() {
-        return delegate.supportsWithClauseHead();
+    public boolean supportsPaginationInWithClause() {
+        return delegate.supportsPaginationInWithClause();
     }
 
     @Override
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BlobEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BlobEntity.java
index 963253f758..f9f2597354 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BlobEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BlobEntity.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.io.Serializable;
 import java.sql.Blob;
 import java.util.Date;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookEntity.java
index 492febba22..954b507384 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookEntity.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookISBNReferenceEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookISBNReferenceEntity.java
index fbcd0e05d4..ec3e450d1c 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookISBNReferenceEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/BookISBNReferenceEntity.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DeletePersonCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DeletePersonCTE.java
index a0a7c56885..1e0d9f88c2 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DeletePersonCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DeletePersonCTE.java
@@ -7,10 +7,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Document.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Document.java
index 9dc75bb1ed..997298f606 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Document.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Document.java
@@ -5,24 +5,24 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentCTE.java
index c482ad760f..b373b4e025 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentCTE.java
@@ -7,11 +7,11 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrimaryKeyJoinColumn;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForEntityKeyMaps.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForEntityKeyMaps.java
index 1b2625e711..cc6414d7be 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForEntityKeyMaps.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForEntityKeyMaps.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.MapKeyJoinColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.MapKeyJoinColumn;
+import jakarta.persistence.Table;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOne.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOne.java
index 77ecc99b58..ec4bf33b4d 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOne.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOne.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOneJoinTable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOneJoinTable.java
index 5ea291fa64..c74b67eb8a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOneJoinTable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForOneToOneJoinTable.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForSimpleOneToOne.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForSimpleOneToOne.java
index 5a6554665c..12f20e952c 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForSimpleOneToOne.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentForSimpleOneToOne.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentHolder.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentHolder.java
index 0b41e3a13f..ef21c202c5 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentHolder.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentHolder.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfo.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfo.java
index ee96e70f4a..5fbcc242c2 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfo.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfo.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfoSimple.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfoSimple.java
index 3aee1507b3..62460b4402 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfoSimple.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentInfoSimple.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentNodeCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentNodeCTE.java
index 677a4efe32..d54a482e2c 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentNodeCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentNodeCTE.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentTupleEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentTupleEntity.java
index 56fa19f423..897494ba96 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentTupleEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentTupleEntity.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentWithNullableName.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentWithNullableName.java
index 817d2174b7..0831ed2bd7 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentWithNullableName.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/DocumentWithNullableName.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntity.java
index 930215d7fc..2d4c80e5ff 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntity.java
@@ -5,15 +5,15 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityContainer.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityContainer.java
index abcfa28bcb..e337edc7b3 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityContainer.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityContainer.java
@@ -9,14 +9,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "emb_tst_ent_cont")
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityEmbeddable.java
index 26b6404489..79a5411b8b 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityEmbeddable.java
@@ -5,19 +5,19 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityId.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityId.java
index 410bf398fd..41367666fc 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityId.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityId.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class EmbeddableTestEntityId implements Serializable {
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityIdEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityIdEmbeddable.java
index f5cbd74f4a..3701aa9624 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityIdEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityIdEmbeddable.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class EmbeddableTestEntityIdEmbeddable implements Serializable {
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityNestedEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityNestedEmbeddable.java
index f8a2042515..a04ab787b4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityNestedEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntityNestedEmbeddable.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Embeddable;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntitySub.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntitySub.java
index 6773ef4839..a77290c3a2 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntitySub.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddableTestEntitySub.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 @Entity
 @DiscriminatorValue("sub")
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntity.java
index 03b39b2205..4b29484a39 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntity.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntityId.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntityId.java
index a4f96cd414..5b6baf3c9e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntityId.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/EmbeddedDocumentTupleEntityId.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdClassEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdClassEntity.java
index c202317767..51b7544cdb 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdClassEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdClassEntity.java
@@ -5,15 +5,15 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdHolderCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdHolderCTE.java
index 7e1ed11067..e68397be42 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdHolderCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IdHolderCTE.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedEmbeddable.java
index d5ecf46a9e..e93cdd0387 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedEmbeddable.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode.java
index 7f09880a9a..85c76068a5 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode2.java
index 22803e84c9..d220e4563e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IndexedNode2.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IntIdEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IntIdEntity.java
index e4d7f9eea3..11c197f52a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IntIdEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/IntIdEntity.java
@@ -7,12 +7,12 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JsonDocument.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JsonDocument.java
index 1102e6c673..8ba0b558b7 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JsonDocument.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JsonDocument.java
@@ -4,10 +4,10 @@
  */
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author Moritz Becker
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JuniorProjectLeader.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JuniorProjectLeader.java
index be7c94cd83..7cc4c126b1 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JuniorProjectLeader.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/JuniorProjectLeader.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedEmbeddable.java
index 61cea80dd7..a6bcd643a4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedEmbeddable.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode.java
index 240c5a5de0..0753d4bec5 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode2.java
index 24bbb4d8b2..da7314821f 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeyedNode2.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity.java
index f6b5a74ada..e4782c293a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity.java
@@ -6,8 +6,8 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity2.java
index 6424b6cf7c..2a5f9c8d82 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/KeysetEntity2.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LargeProject.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LargeProject.java
index a58773acde..5d07dc83a9 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LargeProject.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LargeProject.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LocalizedEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LocalizedEntity.java
index 6681aef0d9..c10be4eb4e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LocalizedEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LocalizedEntity.java
@@ -6,8 +6,8 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LongSequenceEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LongSequenceEntity.java
index d4524755e7..837f3d5944 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LongSequenceEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/LongSequenceEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObject.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObject.java
index 75e8c1828d..4a3ca01c5e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObject.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObject.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer.java
index bc2e8c5bbd..b7c6bbef45 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.AssociationOverride;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.JoinColumn;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer2.java
index 12829758c8..7982736e76 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NameObjectContainer2.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.AssociationOverride;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.JoinColumn;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NaturalIdJoinTableEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NaturalIdJoinTableEntity.java
index f40424ca14..71995db520 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NaturalIdJoinTableEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/NaturalIdJoinTableEntity.java
@@ -5,16 +5,16 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Order.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Order.java
index 4431a63561..15e0904566 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Order.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Order.java
@@ -8,15 +8,15 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPosition.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPosition.java
index 8cd4c56fb1..34d7606519 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPosition.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPosition.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionElement.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionElement.java
index 2d906b4990..1b7fdbb823 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionElement.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionElement.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHead.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHead.java
index 6c19f2821f..d1da15fae7 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHead.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHead.java
@@ -7,12 +7,12 @@
 
 import java.io.Serializable;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHeadId.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHeadId.java
index a15e9055fd..136b409bfc 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHeadId.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionHeadId.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionId.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionId.java
index 40d4b781ff..30da8f06b3 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionId.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/OrderPositionId.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Ownable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Ownable.java
index 04ebc011a2..a78b2c2de6 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Ownable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Ownable.java
@@ -6,11 +6,11 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCte.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCte.java
index a4a736416e..4246b063ae 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCte.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCte.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCteB.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCteB.java
index 49a12d41cb..bbc30969e8 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCteB.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderCteB.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderEntity.java
index e9e7167fd4..7002c31526 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ParameterOrderEntity.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Parent.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Parent.java
index de62834538..a505ce1000 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Parent.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Parent.java
@@ -5,16 +5,16 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonCTE.java
index beeb0b2be9..29b3f7e311 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonCTE.java
@@ -7,10 +7,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonForEntityKeyMaps.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonForEntityKeyMaps.java
index d7f324cb4f..ea7dbe1451 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonForEntityKeyMaps.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PersonForEntityKeyMaps.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBase.java
index 81da6017fd..d90f5d6ba7 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBase.java
@@ -7,18 +7,18 @@
 
 import java.io.Serializable;
 import java.util.*;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderColumn;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBaseContainer.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBaseContainer.java
index 279c4f1b4d..83805d2107 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBaseContainer.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicBaseContainer.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import java.util.Objects;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyBase.java
index 5f87778d0f..e5aae5985a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyBase.java
@@ -6,12 +6,12 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyMapBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyMapBase.java
index c7fc7253e2..f1a006c1bb 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyMapBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertyMapBase.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub1.java
index f02e6f0314..091e66afc7 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub1.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.AssociationOverride;
-import javax.persistence.AssociationOverrides;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AssociationOverrides;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub2.java
index 6f25cfaa06..e94eb18ed9 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicPropertySub2.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.AssociationOverride;
-import javax.persistence.AssociationOverrides;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.AssociationOverrides;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub1.java
index c1ac86f044..028f918576 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub1.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub2.java
index 67c34e2168..8254d625d4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PolymorphicSub2.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveDocument.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveDocument.java
index 57ff8167ee..b258cb818f 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveDocument.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveDocument.java
@@ -4,20 +4,20 @@
  */
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveFamily.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveFamily.java
index 88dad1b6bb..108eb39c5f 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveFamily.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveFamily.java
@@ -4,14 +4,14 @@
  */
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitivePerson.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitivePerson.java
index 06e7929342..cdbcedf359 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitivePerson.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitivePerson.java
@@ -4,16 +4,16 @@
  */
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveVersion.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveVersion.java
index 139e9f6ab3..e4523efe4d 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveVersion.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/PrimitiveVersion.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Project.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Project.java
index 8529ce85e2..c9a84c5eb4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Project.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Project.java
@@ -6,13 +6,13 @@
 package com.blazebit.persistence.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ProjectLeader.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ProjectLeader.java
index 9a98a7a247..497674ff37 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ProjectLeader.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/ProjectLeader.java
@@ -9,15 +9,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Basic;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RawTypeEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RawTypeEntity.java
index 37be9d77a9..8348448c27 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RawTypeEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RawTypeEntity.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.MapKeyClass;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.MapKeyJoinColumn;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.MapKeyClass;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.MapKeyJoinColumn;
+import jakarta.persistence.OneToMany;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RecursiveEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RecursiveEntity.java
index ee3b90ac1b..28b3a073e3 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RecursiveEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/RecursiveEntity.java
@@ -9,14 +9,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root.java
index d2e667d97f..cf3a44f415 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root.java
@@ -5,16 +5,16 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root2.java
index fba9cfb8c6..6f8ccd8faf 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Root2.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.util.List;
 import java.util.Map;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SchemaEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SchemaEntity.java
index 50064803ec..8ff742c6a2 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SchemaEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SchemaEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntityBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntityBase.java
index 0c67830e80..26b3910dbf 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntityBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntityBase.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntitySub.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntitySub.java
index bd3b854445..a860151403 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntitySub.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SecondaryTableEntitySub.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.SecondaryTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.SecondaryTable;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SeniorProjectLeader.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SeniorProjectLeader.java
index f0839f1bf0..6e923e905a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SeniorProjectLeader.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SeniorProjectLeader.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SequenceBaseEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SequenceBaseEntity.java
index b2d42a6573..96f493cd4d 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SequenceBaseEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SequenceBaseEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntity.java
index b5e1cf46eb..d4f4929296 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntityId.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntityId.java
index 92aa2719ec..1b117f45b8 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntityId.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SimpleEmbeddedIdEntityId.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SingularListEntity.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SingularListEntity.java
index 5d48bd1db0..589bf5465a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SingularListEntity.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SingularListEntity.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SmallProject.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SmallProject.java
index 53750b0c71..ceeadc8e70 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SmallProject.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/SmallProject.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/StringIdCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/StringIdCTE.java
index 107f05162e..9f017f7320 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/StringIdCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/StringIdCTE.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1.java
index e8666ccf83..7100d12e04 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub1.java
index da4a96976c..1de47e1e8f 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub1.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub2.java
index 15d1816663..877aff1471 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub1Sub2.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2.java
index 4aceeb4c9a..4e24d09ee9 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub1.java
index 1d6d4f9747..9c72b6b554 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub1.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub2.java
index 2f285ab64c..8ce48f13ab 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Sub2Sub2.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCBase.java
index 5da6d97a9a..9d012b2f79 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCBase.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub1.java
index 42a22c41a8..c2678c2ebf 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub1.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub2.java
index cdb12b45c5..dccff2c011 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TPCSub2.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE1.java
index d9e739922a..cd67e056e3 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE1.java
@@ -7,13 +7,13 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE2.java
index 006377a2d5..9d510a9246 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestAdvancedCTE2.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTE.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTE.java
index 36bbceb781..78b09919ca 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTE.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTE.java
@@ -7,9 +7,9 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTEEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTEEmbeddable.java
index 286a24460f..cf7eec1992 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTEEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/TestCTEEmbeddable.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Version.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Version.java
index d787438a3b..a8b8e1c9e9 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Version.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Version.java
@@ -9,16 +9,16 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Workflow.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Workflow.java
index d28d00b61f..cb38821c78 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Workflow.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/entity/Workflow.java
@@ -11,15 +11,15 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Basic;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
 
 /**
  *
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/IntValueEmbeddable.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/IntValueEmbeddable.java
index 5ddadc82a3..ddded3c706 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/IntValueEmbeddable.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/IntValueEmbeddable.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedBase.java
index 6a8e01a912..f5792de51e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedBase.java
@@ -5,21 +5,21 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub1.java
index 5d5c6b970a..8bbd9823a4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub1.java
@@ -7,16 +7,16 @@
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub2.java
index b84c5f4510..8ecacb17b4 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/JoinedSub2.java
@@ -7,16 +7,16 @@
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableBase.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableBase.java
index 8183adc3fc..0c0ee1f725 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableBase.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableBase.java
@@ -5,21 +5,21 @@
 
 package com.blazebit.persistence.testsuite.treat.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub1.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub1.java
index d05b89fb7a..24947d8f9e 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub1.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub1.java
@@ -7,17 +7,17 @@
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub2.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub2.java
index 11cb50c062..94f15daadc 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub2.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/treat/entity/SingleTableSub2.java
@@ -7,17 +7,17 @@
 
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxSupport.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxSupport.java
index db086c375f..0daf95ed00 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxSupport.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxSupport.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.testsuite.tx;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 
 
 public class TxSupport {
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxVoidWork.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxVoidWork.java
index ef46a93269..db8bd6778f 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxVoidWork.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxVoidWork.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.testsuite.tx;
 
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 public abstract class TxVoidWork {
 
diff --git a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxWork.java b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxWork.java
index 03e019c1f0..71dd74329a 100644
--- a/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxWork.java
+++ b/core/testsuite/src/main/java/com/blazebit/persistence/testsuite/tx/TxWork.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.testsuite.tx;
 
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 public abstract class TxWork<V> {
 
diff --git a/core/testsuite/src/main/java/module-info.java b/core/testsuite/src/main/java/module-info.java
new file mode 100644
index 0000000000..511b864941
--- /dev/null
+++ b/core/testsuite/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+open module com.blazebit.persistence.core.testsuite {
+	requires com.blazebit.persistence.testsuite.assertion;
+	requires com.blazebit.persistence.testsuite.base;
+	requires com.blazebit.persistence.testsuite.base.jpa;
+	requires com.blazebit.persistence.core.impl;
+	requires com.blazebit.persistence.core.parser;
+	requires com.blazebit.persistence.core;
+	requires com.blazebit.common.utils;
+	requires jakarta.annotation;
+	exports com.blazebit.persistence.testsuite;
+	exports com.blazebit.persistence.testsuite.entity;
+	exports com.blazebit.persistence.testsuite.treat.entity;
+	exports com.blazebit.persistence.testsuite.tx;
+	uses com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
+}
\ No newline at end of file
diff --git a/core/testsuite/src/test/hibernate/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/core/testsuite/src/test/hibernate/org/hibernate/engine/spi/SharedSessionContractImplementor.java
deleted file mode 100644
index dca3736d8a..0000000000
--- a/core/testsuite/src/test/hibernate/org/hibernate/engine/spi/SharedSessionContractImplementor.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package org.hibernate.engine.spi;
-
-/**
- * See com.blazebit.persistence.testsuite.base.AbstractPersistenceTest why this is necessary.
- * The short version, we need this stub for custom user type tests for Hibernate before 5.1.
- *
- * @author Christian Beikov
- * @since 1.5.0
- */
-public interface SharedSessionContractImplementor {
-}
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomTypeFunctionArgumentTest.java b/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomTypeFunctionArgumentTest.java
deleted file mode 100644
index 195aec48c1..0000000000
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/CustomTypeFunctionArgumentTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlFunction;
-import com.blazebit.persistence.spi.JpqlFunctionGroup;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import com.vladmihalcea.hibernate.type.array.StringArrayType;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.4.0
- */
-public class CustomTypeFunctionArgumentTest extends AbstractCoreTest {
-
-    @Override
-    protected Class<?>[] getEntityClasses() {
-        return new Class<?>[] { EntityWithCustomType.class };
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        transactional(new TxVoidWork() {
-            @Override
-            public void work(EntityManager em) {
-                EntityWithCustomType entityWithCustomType = new EntityWithCustomType();
-                entityWithCustomType.sensorNames = new String[] {
-                        "Temperature",
-                        "Pressure"
-                };
-                em.persist(entityWithCustomType);
-                em.flush();
-                em.clear();
-            }
-        });
-    }
-
-    @Override
-    protected void configure(CriteriaBuilderConfiguration config) {
-        config.registerFunction(new JpqlFunctionGroup("array_contains", new ArrayContainsFunction()));
-        super.configure(config);
-    }
-
-    // NOTE: this API was only introduced in Hibernate 5
-    @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoDB2.class, NoOracle.class, NoMySQL.class, NoMSSQL.class, NoMySQLOld.class, NoH2.class })
-    public void testHibernateCustomTypedParameterValue() {
-        transactional(new TxVoidWork() {
-            @Override
-            public void work(EntityManager em) {
-                cbf.create(em, EntityWithCustomType.class, "a")
-                        .where("array_contains(a.sensorNames, :elements)").eqLiteral(true)
-                        .setParameter("elements", getTypedParameterValue(StringArrayType.INSTANCE, new String[] { "Temperature"}))
-                        .getSingleResult();
-            }
-        });
-    }
-
-    Object getTypedParameterValue(org.hibernate.type.Type type, Object value) {
-        try {
-            return Class.forName("org.hibernate.jpa.TypedParameterValue").getConstructor(org.hibernate.type.Type.class, Object.class).newInstance(type, value);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Entity
-    @Table(name = "ewct")
-    @TypeDef(
-            name = "string-array",
-            typeClass = StringArrayType.class
-    )
-    public static class EntityWithCustomType {
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.AUTO)
-        private Long id;
-
-        @Type(type = "string-array")
-        @Column(
-                name = "sensor_names",
-                columnDefinition = "text[]"
-        )
-        private String[] sensorNames;
-
-    }
-
-    public static class ArrayContainsFunction implements JpqlFunction {
-
-        @Override
-        public boolean hasArguments() {
-            return true;
-        }
-
-        @Override
-        public boolean hasParenthesesIfNoArguments() {
-            return false;
-        }
-
-        @Override
-        public Class<?> getReturnType(Class<?> firstArgumentType) {
-            return Boolean.class;
-        }
-
-        @Override
-        public void render(FunctionRenderContext context) {
-            context.addArgument(0);
-            context.addChunk(" @> ");
-            context.addArgument(1);
-        }
-    }
-
-}
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue1018Test.java b/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue1018Test.java
deleted file mode 100644
index e87b79f480..0000000000
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue1018Test.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.testsuite.entity.LongSequenceEntity;
-import org.hibernate.HibernateException;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.usertype.UserType;
-import org.junit.Test;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Entity;
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class Issue1018Test extends AbstractCoreTest  {
-
-    @Override
-    protected Class<?>[] getEntityClasses() {
-        return new Class<?>[] {
-                EnumTestEntity.class
-        };
-    }
-
-    public static enum MyEnum {
-        VAL1(10),
-        VAL2(20);
-
-        private final int value;
-
-        MyEnum(int value) {
-            this.value = value;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public static MyEnum byValue(int value) {
-            switch (value) {
-                case 10: return VAL1;
-                case 20: return VAL2;
-            }
-            return null;
-        }
-    }
-
-    public static class MyEnumUserType implements UserType {
-
-        @Override
-        public Class<MyEnum> returnedClass() {
-            return MyEnum.class;
-        }
-
-        public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-            return nullSafeGet(rs, names, (SessionImplementor) null, owner);
-        }
-
-        public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
-            int id = rs.getInt(names[0]);
-            if (rs.wasNull()) {
-                return null;
-            }
-            return MyEnum.byValue(id);
-        }
-
-        public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
-            nullSafeSet(st, value, index, (SessionImplementor) null);
-        }
-
-        public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException {
-            if (value == null) {
-                st.setNull(index, Types.INTEGER);
-            } else {
-                st.setInt(index, ((MyEnum) value).getValue());
-            }
-        }
-
-        @Override
-        public Object assemble(Serializable cached, Object owner) throws HibernateException {
-            return cached;
-        }
-
-        @Override
-        public Object deepCopy(Object value) throws HibernateException {
-            return value;
-        }
-
-        @Override
-        public Serializable disassemble(Object value) throws HibernateException {
-            return (Serializable) value;
-        }
-
-        @Override
-        public boolean equals(Object x, Object y) throws HibernateException {
-            return x == y;
-        }
-
-        @Override
-        public int hashCode(Object x) throws HibernateException {
-            return x == null ? 0 : x.hashCode();
-        }
-
-        @Override
-        public boolean isMutable() {
-            return false;
-        }
-
-        @Override
-        public Object replace(Object original, Object target, Object owner) throws HibernateException {
-            return original;
-        }
-
-        @Override
-        public int[] sqlTypes() {
-            return new int[] { java.sql.Types.INTEGER };
-        }
-
-    }
-
-    @Entity(name = "EnumTestEntity")
-    @Access(AccessType.FIELD)
-    @TypeDef(name = "MyEnumUserType", typeClass = MyEnumUserType.class)
-    public static class EnumTestEntity extends LongSequenceEntity {
-        @Type(type = "MyEnumUserType")
-        MyEnum myEnum;
-    }
-
-    @Test
-    public void testEnumLiteral() {
-        cbf.create(em, EnumTestEntity.class)
-                .where("myEnum").inLiterals(MyEnum.VAL1, MyEnum.VAL2)
-                .whereExpression("myEnum = " + MyEnum.class.getName() + ".VAL1")
-                .getResultList();
-    }
-}
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue545Test.java b/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue545Test.java
deleted file mode 100644
index e886f4013a..0000000000
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue545Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import com.vladmihalcea.hibernate.type.basic.NullableCharacterType;
-import org.hibernate.annotations.Formula;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.1
- */
-public class Issue545Test extends AbstractCoreTest {
-
-    @Override
-    protected Class<?>[] getEntityClasses() {
-        return new Class<?>[] { EntityWithCustomType.class };
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        transactional(new TxVoidWork() {
-            @Override
-            public void work(EntityManager em) {
-                EntityWithCustomType entityWithCustomType = new EntityWithCustomType();
-                entityWithCustomType.customValue = 'c';
-                em.persist(entityWithCustomType);
-                em.flush();
-                em.clear();
-            }
-        });
-    }
-
-    @Test
-    public void queryEntityWithCustomTypeTest() {
-        transactional(new TxVoidWork() {
-            @Override
-            public void work(EntityManager em) {
-                cbf.create(em, EntityWithCustomType.class)
-                        .where("transformedCustomValue").eq('C')
-                        .getSingleResult();
-            }
-        });
-    }
-
-    @Entity
-    @Table(name = "ewct")
-    @TypeDef(name = "CustomType", typeClass = NullableCharacterType.class)
-    public static class EntityWithCustomType {
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.AUTO)
-        private Long id;
-
-        @Type(type = "CustomType")
-        @Column(name = "custom_value")
-        private Character customValue;
-
-        @Formula("UPPER(custom_value)")
-        @Type(type = "CustomType")
-        private Character transformedCustomValue;
-
-    }
-
-}
diff --git a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue992Test.java b/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue992Test.java
deleted file mode 100644
index 98383df872..0000000000
--- a/core/testsuite/src/test/hibernateold/com/blazebit/persistence/testsuite/Issue992Test.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.CTE;
-import com.vladmihalcea.hibernate.type.json.internal.JsonStringSqlTypeDescriptor;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.junit.Test;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.util.Map;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.4.1
- */
-public class Issue992Test extends AbstractCoreTest {
-
-    @Override
-    protected Class<?>[] getEntityClasses() {
-        return new Class<?>[]{ BasicEntity.class, JsonCTE.class };
-    }
-
-    @Entity(name = "BasicEntity")
-    @TypeDef(name = "json", typeClass = JsonStringSqlTypeDescriptor.class)
-    public static class BasicEntity {
-        @Id
-        Long key1;
-
-        @Type(type = "json")
-        Map<String, String> attributeValues;
-
-    }
-
-    @CTE
-    @Entity(name = "JsonCTE")
-    @TypeDef(name = "json", typeClass = JsonStringSqlTypeDescriptor.class)
-    public static class JsonCTE {
-        @Id
-        Long key1;
-
-        @Type(type = "json")
-        Map<String, String> attributeValues;
-
-    }
-
-    @Test
-    public void test1() {
-        cbf.create(em, JsonCTE.class)
-                .with(JsonCTE.class)
-                    .from(BasicEntity.class)
-                    .bind("key1").select("key1")
-                    .bind("attributeValues").select("NULL")
-                .end()
-                .getResultList();
-    }
-
-}
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java
index a05776bbf2..4fd213ee73 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java
@@ -5,15 +5,14 @@
 
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.entity.Document;
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.util.Arrays;
-import java.util.Collection;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.entity.Document;
 
 /**
  * @author Christian Beikov
@@ -29,7 +28,7 @@ public class AdvancedQueryCachingTest extends AbstractCoreTest {
      */
     @Test
     // NOTE: This uses advanced SQL that isn't supported for other JPA providers yet
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void differentParameterListSizesShouldNotResultInQueryCacheHit() {
         toUpperDocumentNames(Arrays.asList(1L));
         toUpperDocumentNames(Arrays.asList(1L, 2L));
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java
index e7d6ee2a2d..1b9a6e63fb 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java
@@ -6,20 +6,15 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,7 +37,7 @@ protected Class<?>[] getEntityClasses() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class})
+    @Category({NoEclipselink.class})
     public void test() {
         CriteriaBuilder<RootEntity> crit = cbf.create(em, RootEntity.class, "root")
                 .innerJoin("container", "container_1")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java
index cbac0d2295..adacbe4e6d 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java
@@ -7,20 +7,13 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.parser.expression.ArrayExpression;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -237,9 +230,7 @@ public void testPredicateIndexReuseBase() {
         criteria.getResultList();
     }
 
-    // NOTE: Older Hibernate versions don't like the IS NULL predicate when applied to an association in the ON clause
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class })
     public void testNewImplicitRoot() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class).from(Document.class, "d");
         criteria.select("d.contacts[friend IS NULL]");
@@ -251,8 +242,6 @@ public void testNewImplicitRoot() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class })
     public void testEntityArray() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class).from(Document.class, "d");
         criteria.select("Person[name = d.name]");
@@ -264,8 +253,6 @@ public void testEntityArray() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class })
     public void testEntityArrayReuse() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class).from(Document.class, "d");
         criteria.select("Person[name = d.name].id");
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java
index c5bdc65bc2..5ef116a2d4 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java
@@ -5,24 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.PersistenceException;
+import com.blazebit.persistence.CTE;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.PersistenceException;
 
 /**
  * @author Moritz Becker
  * @since 1.4.0
  */
-@Category({NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class CTEEntityInheritanceCheckTest extends AbstractCoreTest {
 
     @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java
index da7875fde2..0745b97eef 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java
@@ -5,23 +5,22 @@
 
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.RecursiveEntity;
 import com.blazebit.persistence.testsuite.entity.TestCTE;
 import com.blazebit.persistence.testsuite.entity.Version;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.TypedQuery;
-import java.util.Properties;
+import jakarta.persistence.TypedQuery;
 
 /**
  * @author Jan-Willem Gmelig Meyling
@@ -60,7 +59,7 @@ public final void tearDown() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class })
+    @Category({ NoEclipselink.class, NoMySQL.class })
     public void cteQueryResultCachingTest() {
         TypedQuery<TestCTE> query = cbf.create(em, TestCTE.class).with(TestCTE.class)
                 .from(RecursiveEntity.class, "e")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java
index 4b2b84c554..fe7b995723 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java
@@ -5,30 +5,28 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.FullSelectCTECriteriaBuilder;
 import com.blazebit.persistence.LeafOngoingSetOperationCTECriteriaBuilder;
 import com.blazebit.persistence.PagedList;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
 import com.blazebit.persistence.impl.BuilderChainingException;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.RecursiveEntity;
 import com.blazebit.persistence.testsuite.entity.TestAdvancedCTE1;
 import com.blazebit.persistence.testsuite.entity.TestAdvancedCTE2;
 import com.blazebit.persistence.testsuite.entity.TestCTE;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -73,7 +71,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testBindingNull() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2");
         cb.with(TestAdvancedCTE1.class, false)
@@ -89,7 +87,7 @@ public void testBindingNull() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testNotFullyBoundCTE() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t");
         FullSelectCTECriteriaBuilder<CriteriaBuilder<TestCTE>> fullSelectCTECriteriaBuilder = cb.with(TestCTE.class, false)
@@ -103,7 +101,7 @@ public void testNotFullyBoundCTE() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testNotFullyBoundCTEOnSetOperation() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class);
         FullSelectCTECriteriaBuilder<CriteriaBuilder<TestCTE>> builder = cb.with(TestCTE.class, false)
@@ -115,7 +113,7 @@ public void testNotFullyBoundCTEOnSetOperation() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testNotFullyBoundCTEOnSecondSetOperation() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class);
         LeafOngoingSetOperationCTECriteriaBuilder<CriteriaBuilder<TestCTE>> builder = cb.with(TestCTE.class, false)
@@ -134,7 +132,7 @@ public void testNotFullyBoundCTEOnSecondSetOperation() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testNotDefinedCTE() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t");
 
@@ -144,7 +142,7 @@ public void testNotDefinedCTE() {
     }
     
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testCTE() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2");
         cb.with(TestCTE.class, false)
@@ -167,7 +165,7 @@ public void testCTE() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testCTEAdvanced() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2");
         cb.with(TestAdvancedCTE1.class, false)
@@ -196,7 +194,7 @@ public void testCTEAdvanced() {
 
     // NOTE: Apparently H2 doesn't like limit in CTEs
     @Test
-    @Category({ NoH2.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testCTELimit() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t");
         cb.with(TestCTE.class, false)
@@ -222,7 +220,7 @@ public void testCTELimit() {
 
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testRecursiveCTE() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2");
         cb.withRecursive(TestCTE.class)
@@ -256,7 +254,7 @@ public void testRecursiveCTE() {
 
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testPaginationWithRecursiveCte() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class).orderByAsc("id");
         // The CTE doesn't really matter, it's just there to trigger #570
@@ -283,7 +281,7 @@ public void testPaginationWithRecursiveCte() {
 
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testRecursiveCTEAdvanced() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2");
         cb.withRecursive(TestAdvancedCTE1.class)
@@ -325,7 +323,7 @@ public void testRecursiveCTEAdvanced() {
 
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testRecursiveCTEPagination() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class);
         cb.withRecursive(TestCTE.class)
@@ -397,7 +395,7 @@ public void testRecursiveCTEPagination() {
     // NOTE: Apparently H2 before 1.4.199 produces wrong results when a CTE is used with IN predicate
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testRecursiveCTEPaginationIdQuery() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.withRecursive(TestCTE.class)
@@ -495,7 +493,7 @@ public void testRecursiveCTEPaginationIdQuery() {
 
     // TODO: Oracle requires a cycle clause #295
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testRecursiveCTEPaginationIdQueryLeftJoin() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.withRecursive(TestCTE.class)
@@ -588,7 +586,7 @@ public void testRecursiveCTEPaginationIdQueryLeftJoin() {
     
     // NOTE: Apparently H2 before 1.4.199 can't handle multiple CTEs
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testCTEInSubquery() {
         CriteriaBuilder<String> cb = cbf.create(em, String.class)
             .from(RecursiveEntity.class, "r")
@@ -619,7 +617,7 @@ public void testCTEInSubquery() {
 
     // NOTE: Apparently H2 can't handle multiple CTEs
     @Test
-    @Category({ NoH2.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testBindEmbeddable() {
         CriteriaBuilder<TestAdvancedCTE2> cb = cbf.create(em, TestAdvancedCTE2.class);
         cb.with(TestAdvancedCTE1.class, false)
@@ -659,7 +657,7 @@ public void testBindEmbeddable() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testBindEmbeddableWithNullBindingsForJoinableAttributes() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class);
         cb.with(TestAdvancedCTE1.class, false)
@@ -693,7 +691,7 @@ public void testBindEmbeddableWithNullBindingsForJoinableAttributes() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testWithStartSetEmptyRightSide() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class);
         cb.withStartSet(TestAdvancedCTE1.class, false)
@@ -718,7 +716,7 @@ public void testWithStartSetEmptyRightSide() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testWithStartSetEmptyRightSideLeaf() {
         CriteriaBuilder<TestAdvancedCTE1> cb = cbf.create(em, TestAdvancedCTE1.class);
         cb.withStartSet(TestAdvancedCTE1.class, false)
@@ -745,7 +743,7 @@ public void testWithStartSetEmptyRightSideLeaf() {
 
     @Test
     // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate EXCEPT ALL
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQL.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testWithStartSetEmptyLeftSideLeaf() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class)
         .withStartSet(TestCTE.class, false)
@@ -774,7 +772,7 @@ public void testWithStartSetEmptyLeftSideLeaf() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testBuilderEndTracking() {
         FullSelectCTECriteriaBuilder<CriteriaBuilder<TestCTE>> cb = cbf.create(em, TestCTE.class).with(TestCTE.class, false);
         cb.from(RecursiveEntity.class, "e")
@@ -793,7 +791,7 @@ public void testBuilderEndTracking() {
 
     // from issue #513
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testNestedSizeInCte() {
         CriteriaBuilder<Long> cb = cbf.create(em, Long.class)
                 .with(TestCTE.class, false)
@@ -815,7 +813,7 @@ public void testNestedSizeInCte() {
     // For issue #1563
     @Test
     // NOTE: MySQL doesn't support nesting set operands i.e. `q1 union (q2 union q3)` is illegal, but `q1 union q2 union q3` is fine. Let's ignore that for now
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class })
+    @Category({ NoEclipselink.class, NoMySQL.class })
     public void testInlineInSetOperand() {
         CriteriaBuilder<Object[]> cb = cbf.create(em, Object[].class);
         cb.with(TestAdvancedCTE1.class, true)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CaseWhenTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CaseWhenTest.java
index 89ff0bc2a2..d3d278c296 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CaseWhenTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CaseWhenTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import org.junit.Test;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java
index c9e26c9a11..013c06e1be 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java
@@ -6,13 +6,8 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.*;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 
@@ -91,8 +86,6 @@ public void testManyToManyJoinTableDuplicateName() {
     }
 
     @Test
-    // NOTE: http://hibernate.atlassian.net/browse/HHH-10229
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
     public void testElementCollection() {
         CriteriaBuilder<Object[]> criteria = cbf.create(em, Object[].class);
         criteria.from(Root.class, "r");
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java
index a3367db5cd..4e3dcf80ad 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java
@@ -5,13 +5,15 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.DeleteCriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable;
 import com.blazebit.persistence.testsuite.entity.IndexedNode;
 import com.blazebit.persistence.testsuite.entity.KeyedEmbeddable;
@@ -25,16 +27,10 @@
 import com.blazebit.persistence.testsuite.entity.Sub2Sub1;
 import com.blazebit.persistence.testsuite.entity.Sub2Sub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -42,7 +38,7 @@
  * @since 1.2.0
  */
 // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class CollectionRoleDeleteTest extends AbstractCoreTest {
 
     @Before
@@ -126,7 +122,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void deleteIndexedImplicitJoin() {
         DeleteCriteriaBuilder<Root> criteria = cbf.deleteCollection(em, Root.class, "r", "indexedNodes");
         criteria.where("r.name").eq("r");
@@ -143,7 +139,7 @@ public void deleteIndexedImplicitJoin() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void deleteIndexedMultipleDeepImplicitJoin() {
         DeleteCriteriaBuilder<Root> criteria = cbf.deleteCollection(em, Root.class, "r", "indexedNodes");
         criteria.where("r.name").eq("r");
@@ -164,7 +160,7 @@ public void deleteIndexedMultipleDeepImplicitJoin() {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void deleteIndexedReturning() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java
index c12e5de197..b0a804d5a4 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java
@@ -5,13 +5,17 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.InsertCriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable;
 import com.blazebit.persistence.testsuite.entity.IndexedNode;
@@ -26,14 +30,8 @@
 import com.blazebit.persistence.testsuite.entity.Sub2Sub1;
 import com.blazebit.persistence.testsuite.entity.Sub2Sub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-
-import java.util.Collections;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -44,7 +42,7 @@
  * @since 1.2.0
  */
 // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class CollectionRoleInsertTest extends AbstractCoreTest {
 
     private static final Integer I2_ID = 4;
@@ -185,7 +183,7 @@ public void work(EntityManager em) {
     // NOTE: Oracle doesn't support the RETURNING clause for INSERT .. SELECT statements, only for INSERT .. VALUES
     // https://stackoverflow.com/questions/5325033/plsql-insert-into-with-subquery-and-returning-clause-oracle
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoEclipselink.class })
     public void insertIndexedReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -446,7 +444,7 @@ public void work(EntityManager em) {
     // NOTE: Oracle doesn't support the RETURNING clause for INSERT .. SELECT statements, only for INSERT .. VALUES
     // https://stackoverflow.com/questions/5325033/plsql-insert-into-with-subquery-and-returning-clause-oracle
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoEclipselink.class })
     public void insertIndexedReturningWithParams() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java
index 2fdec94f5b..4d5bdcc6cd 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java
@@ -5,38 +5,37 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.DeleteCriteriaBuilder;
 import com.blazebit.persistence.ReturningObjectBuilder;
 import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.SimpleReturningBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -82,7 +81,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testSimple() {
         transactional(new TxVoidWork() {
             @Override
@@ -108,7 +107,7 @@ public void work(EntityManager em) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAll() {
         transactional(new TxVoidWork() {
             @Override
@@ -136,7 +135,7 @@ public void work(EntityManager em) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAllObjectBuilder() {
         transactional(new TxVoidWork() {
             @Override
@@ -181,7 +180,7 @@ public List<String> buildList(List<String> list) {
     @Test
     // NOTE: No returning support yet for collection DML for inverse deletes
     @Ignore
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLast() {
         transactional(new TxVoidWork() {
             @Override
@@ -209,7 +208,7 @@ public void work(EntityManager em) {
     @Test
     // NOTE: No returning support yet for collection DML for inverse deletes
     @Ignore
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testDeleteReturningSelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -250,7 +249,7 @@ public void work(EntityManager em) {
     @Test
     // NOTE: No returning support yet for collection DML for inverse deletes
     @Ignore
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testDeleteReturningSelectNew() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java
index 520efa7321..45b081aff2 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java
@@ -5,16 +5,17 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.UpdateCriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable;
 import com.blazebit.persistence.testsuite.entity.IndexedNode;
@@ -30,13 +31,8 @@
 import com.blazebit.persistence.testsuite.entity.Sub2Sub1;
 import com.blazebit.persistence.testsuite.entity.Sub2Sub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -47,7 +43,7 @@
  * @since 1.2.0
  */
 // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class CollectionRoleUpdateTest extends AbstractCoreTest {
 
     private static final Integer I2_ID = 4;
@@ -156,7 +152,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void updateIndexedImplicitJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -186,7 +182,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void updateIndexedMultipleDeepImplicitJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -222,7 +218,7 @@ public void work(EntityManager em) {
     // NOTE: H2 and MySQL only support returning generated keys
     // NOTE: DB2 and Oracle do not support FROM FINAL TABLE or RETURNING with MERGE. Fix this with https://github.com/Blazebit/blaze-persistence/issues/1137
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDB2.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoDB2.class, NoOracle.class, NoEclipselink.class })
     public void updateIndexedReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -460,9 +456,8 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
+    @Category({NoEclipselink.class})
     public void updateKeyedWithInlineCte() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ComplexExpressionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ComplexExpressionTest.java
index b7c171faf4..69ef29b1ca 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ComplexExpressionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ComplexExpressionTest.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 import java.util.Locale;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import org.junit.Test;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java
index a1d9970738..7bb205f3ed 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java
@@ -5,19 +5,17 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.impl.function.alias.AliasFunction;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -130,7 +128,7 @@ public void countQueryWithGroupBy() {
 
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void countQueryWithGroupByAndLimit() {
         CriteriaBuilder<Long> crit = cbf.create(em, Long.class)
                 .from(Document.class, "d")
@@ -150,7 +148,7 @@ public void countQueryWithGroupByAndLimit() {
 
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void countQueryFromHavingQuery() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d");
         crit.select("d.id")
@@ -186,7 +184,7 @@ public void countQueryWithDistinct() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void boundedCountQueryFromSimpleQuery() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d");
@@ -201,7 +199,7 @@ public void boundedCountQueryFromSimpleQuery() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void boundedCountQueryFromCollectionJoinQuery() {
         CriteriaBuilder<Tuple> crit = cbf.create(em, Tuple.class)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateAddTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateAddTest.java
index 90ed3c443c..5ef9b6e124 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateAddTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateAddTest.java
@@ -12,8 +12,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateDiffTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateDiffTest.java
index c3b804e2e3..6502e03f66 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateDiffTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateDiffTest.java
@@ -14,9 +14,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TemporalType;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Tuple;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.util.Calendar;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateExtractTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateExtractTest.java
index c6b2a814cd..2459180965 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateExtractTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateExtractTest.java
@@ -6,6 +6,7 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
@@ -14,11 +15,12 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.util.Arrays;
@@ -490,6 +492,8 @@ public void testDateExtractMicrosecond() {
     }
 
     @Test
+    // NOTE: Hibernate ORM has a bug: https://hibernate.atlassian.net/browse/HHH-18837
+    @Category({ NoOracle.class })
     public void testDateExtractEpoch() {
         // Set the client timezone
         TimeZone.setDefault(clientTimeZone);
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java
index c496d84d0d..70daa63833 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
@@ -14,8 +14,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -243,7 +243,7 @@ public void testDateTruncSecond() {
 
     // NOTE: H2 2.0 changed the meaning of "week" to be locale sensitive: https://github.com/h2database/h2database/issues/3922
     @Test
-    @Category({ NoH2Latest.class })
+    @Category({ NoH2.class })
     public void testDateTruncWeek() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
             .from(Document.class, "doc")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java
index 8c019177b3..9ab0c289b5 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java
@@ -5,19 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.DeleteCriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
@@ -28,17 +30,11 @@
 import com.blazebit.persistence.testsuite.entity.PolymorphicSub2;
 import com.blazebit.persistence.testsuite.entity.StringIdCTE;
 import com.blazebit.persistence.testsuite.entity.TPCBase;
-import com.blazebit.persistence.testsuite.entity.TPCSub2;
 import com.blazebit.persistence.testsuite.entity.TPCSub1;
+import com.blazebit.persistence.testsuite.entity.TPCSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -168,9 +164,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // NOTE: MySQL does not support CTEs
     // NOTE: H2 only supports with clause in select statement
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testTablePerClassWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -201,9 +196,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // NOTE: MySQL does not support CTEs
     // NOTE: H2 only supports with clause in select statement
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testJoinedWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -234,9 +228,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // NOTE: MySQL does not support CTEs
     // NOTE: H2 only supports with clause in select statement
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testSingleTableWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -268,7 +261,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -290,7 +283,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -312,7 +305,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -334,7 +327,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -366,7 +359,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -398,7 +391,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -434,7 +427,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -468,7 +461,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -502,7 +495,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -537,7 +530,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -576,7 +569,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -615,7 +608,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java
index ab6e6e709e..af256fb99d 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java
@@ -5,10 +5,6 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -16,31 +12,29 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.ReturningObjectBuilder;
-import com.blazebit.persistence.SimpleReturningBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.DeleteCriteriaBuilder;
+import com.blazebit.persistence.ReturningObjectBuilder;
 import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.SimpleReturningBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -171,7 +165,7 @@ public void work(EntityManager em) {
     
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAll() {
         transactional(new TxVoidWork() {
             @Override
@@ -194,7 +188,7 @@ public void work(EntityManager em) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAllObjectBuilder() {
         transactional(new TxVoidWork() {
             @Override
@@ -232,7 +226,7 @@ public List<String> buildList(List<String> list) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLast() {
         transactional(new TxVoidWork() {
             @Override
@@ -254,7 +248,7 @@ public void work(EntityManager em) {
     // NOTE: H2 only supports with clause in select statement
     // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLastWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -286,9 +280,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: H2 only supports with clause in select statement
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testSimpleWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -318,7 +311,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testDeleteReturningSelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -352,7 +345,7 @@ public void work(EntityManager em) {
     
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testDeleteReturningSelectNew() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ElementCollectionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ElementCollectionTest.java
index c5c0653357..4e032b2b86 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ElementCollectionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ElementCollectionTest.java
@@ -9,7 +9,7 @@
 
 import java.util.Locale;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import org.junit.Test;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java
index ceb1a1ea0b..443bf79618 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java
@@ -7,15 +7,10 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.Tuple;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import jakarta.persistence.Tuple;
+
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -23,7 +18,6 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 
 /**
  * This kind of mapping is not required to be supported by a JPA implementation.
@@ -32,8 +26,7 @@
  * @since 1.0.6
  */
 // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062
-// TODO: report that datanucleus doesn't support element collection in an embeddable
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({NoEclipselink.class})
 public class EmbeddableComplexTest extends AbstractCoreTest {
 
     @Override
@@ -124,8 +117,6 @@ public void testWhereEmbeddableElementCollectionPropertyFilter() {
     }
     
     @Test
-    // NOTE: http://hibernate.atlassian.net/browse/HHH-10229
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
     public void testSelectEmbeddableElementCollection() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e")
             .select("embeddable.elementCollection");
@@ -136,8 +127,6 @@ public void testSelectEmbeddableElementCollection() {
     }
 
     @Test
-    // NOTE: http://hibernate.atlassian.net/browse/HHH-10229
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
     public void testSelectEmbeddableElementCollectionArraySyntax() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e")
                 .select("embeddable.elementCollection['test']");
@@ -148,8 +137,6 @@ public void testSelectEmbeddableElementCollectionArraySyntax() {
     }
 
     @Test
-    // NOTE: http://hibernate.atlassian.net/browse/HHH-10229
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
     public void testSelectEmbeddableElementCollectionArraySyntaxValue() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e")
                 .select("embeddable.elementCollection['test'].primaryName");
@@ -177,7 +164,7 @@ public void testSelectEmbeddableFetchElementCollection() {
     @Test
     // Test for #598
     // NOTE: Hibernate 6.0 supports this now
-    @Category(NoHibernate60.class)
+    @Category(NoHibernate.class)
     public void testSelectEmbeddableFetchElementCollectionJpaOnly() {
         try {
             em.createQuery("SELECT e.embeddable FROM EmbeddableTestEntity e JOIN FETCH e.embeddable.elementCollection2").getResultList();
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java
index 203b766662..9b2c0336b3 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java
@@ -5,23 +5,17 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.Order;
 import com.blazebit.persistence.testsuite.entity.OrderPosition;
 import com.blazebit.persistence.testsuite.entity.OrderPositionElement;
 import com.blazebit.persistence.testsuite.entity.OrderPositionHead;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -86,8 +80,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testCyclicDependencyInOnClauseImplicitJoin2() {
         CriteriaBuilder<OrderPosition> criteria = cbf.create(em, OrderPosition.class, "p");
         criteria.leftJoinDefaultOn("p.order", "o")
@@ -97,8 +89,7 @@ public void testCyclicDependencyInOnClauseImplicitJoin2() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testCyclicDependencyInOnClauseImplicitJoin3() {
         CriteriaBuilder<OrderPosition> criteria = cbf.create(em, OrderPosition.class, "p");
         criteria.leftJoinDefaultOn("p.order", "o")
@@ -108,9 +99,7 @@ public void testCyclicDependencyInOnClauseImplicitJoin3() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    // NOTE: DataNucleus 4 does not seem to support TYPE(x) IN (..)
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus4.class })
+    @Category({ NoEclipselink.class })
     public void testCyclicDependencyInOnClauseImplicitJoin4() {
         CriteriaBuilder<OrderPosition> criteria = cbf.create(em, OrderPosition.class, "p");
         criteria.leftJoinDefaultOn("p.order", "o")
@@ -120,8 +109,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin4() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testCyclicDependencyInOnClauseImplicitJoin5() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -131,8 +118,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin5() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
     public void testCyclicDependencyInOnClauseImplicitJoin6() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -142,8 +127,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin6() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoin7() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefault("o.orderPositions", "p")
@@ -160,8 +143,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin7() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoin8() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefault("o.orderPositions", "p")
@@ -179,8 +160,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin8() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoin9() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefault("o.orderPositions", "p")
@@ -199,8 +178,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin9() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoin10() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -220,8 +197,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin10() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoin11() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -242,8 +217,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin11() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class })
     public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -266,8 +239,7 @@ public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction2() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefaultOn("o.orderPositions", "p")
@@ -299,8 +271,7 @@ public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction2() {
     }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testImplicitJoinSingularAttributeInOnClause() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefault("o.orderPositions", "p")
@@ -337,8 +308,7 @@ public void testImplicitJoinSingularAttributeInOnClause() {
 //    }
 
     @Test
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSingleValueAssociationIdAccessInOnClause() {
         CriteriaBuilder<Order> criteria = cbf.create(em, Order.class, "o");
         criteria.leftJoinDefault("o.orderPositions", "p")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java
index 0ab80e1772..c4ca9d3f3d 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,8 +31,6 @@ public void neverRewriteEntityAssociationEqualsEntityInWhere() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support transient objects as parameters
-    @Category({ NoDatanucleus.class })
     public void neverRewriteEntityAssociationEqualsTransientEntityParameterInWhere() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         criteria.where("d.owner").eq(new Person(1L));
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java
index 5dd72e5781..98daaaf046 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java
@@ -5,18 +5,13 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +21,6 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
 public class EntityEqualityNoRewriteToIdTest extends AbstractCoreTest {
 
     @Test
@@ -42,7 +36,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported() {
     }
 
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class })
     public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported1() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class, "p");
         criteria.innerJoinOn(Document.class,"correlated_ownedDocuments")
@@ -56,7 +49,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported1() {
     }
 
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class })
     public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported2() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class, "p");
         criteria.select("correlated_ownedDocuments.owner.name");
@@ -71,8 +63,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported2() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support transient objects as parameters
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class })
     public void neverRewriteEntityAssociationEqualsTransientEntityParameterInOnIfSupported() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         criteria.innerJoinOn("partners","p")
@@ -86,7 +76,7 @@ public void neverRewriteEntityAssociationEqualsTransientEntityParameterInOnIfSup
 
     @Test
     // NOTE: Eclipselink loads entities when doing getReference()
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void neverRewriteEntityAssociationEqualsManagedEntityParameterInOnIfSupported() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         criteria.innerJoinOn("partners","p")
@@ -111,8 +101,6 @@ public void neverRewriteEntityEqualsEntityAssociationInOnIfSupported() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support transient objects as parameters
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class })
     public void neverRewriteEntityEqualsTransientEntityParameterInOn() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         criteria.innerJoinOn("partners","p")
@@ -126,7 +114,7 @@ public void neverRewriteEntityEqualsTransientEntityParameterInOn() {
 
     @Test
     // NOTE: Eclipselink loads entities when doing getReference()
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void neverRewriteEntityEqualsManagedEntityParameterInOn() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         criteria.innerJoinOn("partners","p")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java
deleted file mode 100644
index c5287b6167..0000000000
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.Assume;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test that asserts Hibernate versions which can't handle entity comparisons do id rewrites.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
-public class EntityEqualityRewriteToIdTest extends AbstractCoreTest {
-
-    @Test
-    // This actually only makes sense for Hibernate 5.1
-    public void rewriteEntityAssociationEqualsEntityInOnToIdEquals() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-            .on("p.partnerDocument").eqExpression("d")
-        .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p.partnerDocument.id = d.id"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // Pre Hibernate 5.1 we could do this broken thing to make some stuff work
-    public void rewriteEntityAssociationEqualsEntityInOnToIdEqualsBroken() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-                .on("p.partnerDocument").eqExpression("d")
-                .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p.partnerDocument.id = d"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // Pre Hibernate 5.1 we could do this broken thing to make some stuff work
-    public void rewriteEntityAssociationEqualsParameterInOnToIdEquals() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() <= 1);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-            .on("p.partnerDocument").eq(new Document(1L))
-        .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p.partnerDocument.id = :param_0"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // This actually only makes sense for Hibernate 5.1
-    public void rewriteEntityEqualsEntityAssociationInOnToIdEquals() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-            .on("p").eqExpression("d.owner")
-        .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p.id = d.owner.id"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // Pre Hibernate 5.1 we could do this broken thing to make some stuff work
-    public void rewriteEntityEqualsEntityAssociationInOnToIdEqualsBroken() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-                .on("p").eqExpression("d.owner")
-                .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p = d.owner.id"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // This actually only makes sense for Hibernate 5.1
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate52.class, NoHibernate53.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
-    public void rewriteEntityEqualsTransientEntityParameterInOn() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-                .on("p").eq(new Person(1L))
-                .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p.id = :param_0"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-    @Test
-    // Pre Hibernate 5.1 we could do this broken thing to make some stuff work
-    public void rewriteEntityEqualsTransientEntityParameterInOnBroken() {
-        Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0);
-        CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
-        criteria.innerJoinOn("partners","p")
-                .on("p").eq(new Person(1L))
-                .end();
-
-        assertEquals("SELECT d FROM Document d JOIN d.partners p"
-                + onClause("p = :param_0"), criteria.getQueryString());
-        criteria.getResultList();
-    }
-
-}
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java
index f7c06ac00f..5bada47193 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java
@@ -5,24 +5,23 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentTupleEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddedDocumentTupleEntity;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
-import java.util.Arrays;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 
 import static org.junit.Assert.assertEquals;
 
@@ -75,7 +74,7 @@ public void setUp() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void entityClassWithMultipleRelationsInValuesClause() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
 
@@ -96,7 +95,7 @@ public void entityClassWithMultipleRelationsInValuesClause() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void entityClassWithEmbeddedIdInValuesClause() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java
index cc3d2697f1..2e381e80c0 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java
@@ -5,21 +5,16 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -29,8 +24,6 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class})
 public class EntityJoinTest extends AbstractCoreTest {
 
     @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntitySchemaInTableAnnotationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntitySchemaInTableAnnotationTest.java
index b4b4a6e843..e32c569998 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntitySchemaInTableAnnotationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntitySchemaInTableAnnotationTest.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.testsuite.entity.SchemaEntity;
 import org.junit.Test;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.sql.Connection;
 import java.util.Properties;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EnumTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EnumTest.java
index 529fe315d8..fd6b0e1d97 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EnumTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EnumTest.java
@@ -9,8 +9,8 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/FunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/FunctionTest.java
index 28869c3caa..d2a5f29a94 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/FunctionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/FunctionTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import org.junit.Test;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java
index 2771dec449..cac794526c 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java
@@ -6,31 +6,11 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.IntIdEntity;
-import com.blazebit.persistence.testsuite.entity.Order;
-import com.blazebit.persistence.testsuite.entity.OrderPosition;
-import com.blazebit.persistence.testsuite.entity.OrderPositionElement;
-import com.blazebit.persistence.testsuite.entity.OrderPositionHead;
-import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.SimpleEmbeddedIdEntity;
 import com.blazebit.persistence.testsuite.entity.SimpleEmbeddedIdEntityId;
-import com.blazebit.persistence.testsuite.entity.Version;
-import com.blazebit.persistence.testsuite.entity.Workflow;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java
index 170c7bbed2..e2566bf214 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java
@@ -5,23 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,9 +30,7 @@
  */
 public class GroupByTest extends AbstractCoreTest {
 
-    // Datanucleus does not support grouping by a byte[] as it seems
     @Test
-    @Category({ NoDatanucleus.class })
     public void testGroupByEntitySelect() {
         CriteriaBuilder<Long> criteria = cbf.create(em, Long.class).from(Document.class, "d");
         criteria.groupBy("d.owner");
@@ -62,7 +58,7 @@ public void testSizeTransformWithImplicitParameterGroupBy1() {
 
     // This is a MySQL only test
     @Test
-    @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoH2.class, NoMSSQL.class, NoEclipselink.class})
+    @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoH2.class, NoMSSQL.class, NoEclipselink.class})
     public void testImplicitGroupByFunctionExpression() {
         CriteriaBuilder<Long> criteria = cbf.create(em, Long.class).from(Document.class, "d")
                 .select("CAST_DATE(FUNCTION('date', '2000-01-01'))")
@@ -96,7 +92,9 @@ public void testOmitGroupByLiteral() {
         cb.getResultList();
     }
 
+    // NOTE: Hibernate ORM doesn't detect that it has to use the join alias column
     @Test
+    @Category({ NoHibernate.class })
     public void testGroupBySubqueryCorrelatedExpression() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d")
@@ -143,8 +141,6 @@ public void testGroupByElementCollectionKey() {
     }
 
     @Test
-    // DataNucleus4 apparently can't handle join of associations within element collections
-    @Category({ NoDatanucleus4.class })
     public void testGroupByElementCollectionValue() {
         CriteriaBuilder<Long> cb = cbf.create(em, Long.class)
                 .from(Document.class, "d")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupConcatTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupConcatTest.java
index 8a9cd49b98..a2c0c8de07 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupConcatTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupConcatTest.java
@@ -7,8 +7,8 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassAttributePaginationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassAttributePaginationTest.java
index 64828b7f00..650413dbe5 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassAttributePaginationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassAttributePaginationTest.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java
index 828b8d8d52..5f01c207bd 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java
@@ -5,19 +5,18 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.IdClassEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 
 import static org.junit.Assert.assertEquals;
 
@@ -57,7 +56,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValueQuery() {
         IdClassEntity e1 = new IdClassEntity(1,"1",  1);
         IdClassEntity e2 = new IdClassEntity(2,"2",  2);
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java
index ef5c369c8b..da4448e194 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java
@@ -5,21 +5,18 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.entity.Document;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  *
  * @author Christian Beikov
@@ -29,8 +26,6 @@
 public class InTest extends AbstractCoreTest {
 
     @Test
-    // NOTE: See https://hibernate.atlassian.net/browse/HHH-9630
-    @Category({ NoHibernate42.class, NoHibernate43.class })
     public void testBuggyHqlIn() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         List<Integer> indicies = Arrays.asList(new Integer[]{ 1, 2, 3, 4, 5 });
@@ -46,8 +41,6 @@ public void testBuggyHqlIn() {
     }
 
     @Test
-    // NOTE: See https://hibernate.atlassian.net/browse/HHH-9630
-    @Category({ NoHibernate42.class, NoHibernate43.class })
     public void testBuggyHqlIn1() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
         List<Integer> indicies = Arrays.asList(new Integer[]{ 1, 2, 3, 4, 5 });
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java
index db6909bc7e..fde2141390 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java
@@ -5,18 +5,16 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentCTE;
@@ -32,14 +30,7 @@
 import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.entity.Workflow;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.Collections;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -101,11 +92,8 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
-    // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses
-    // NOTE: H2 v2 issue: https://github.com/h2database/h2database/issues/3621
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoMySQLOld.class, NoH2Latest.class })
+    @Category({ NoEclipselink.class })
     public void testInliningFromSubqueryCte() {
         cbf.create(em, RecursiveEntity.class)
                 .withRecursive(DocumentCTE.class)
@@ -137,9 +125,8 @@ public void testInliningFromSubqueryCte() {
     }
 
     // TODO: Oracle requires a cycle clause #295
-    // NOTE: H2 v2 issue: https://github.com/h2database/h2database/issues/3621
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoH2Latest.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testReusedNestedCte() {
         CriteriaBuilder<ParameterOrderEntity> cteBuilder = cbf.create(em, ParameterOrderEntity.class)
                 .withRecursive(TestCTE.class)
@@ -220,9 +207,8 @@ public void testReusedNestedCte() {
     }
 
     // TODO: Oracle requires a cycle clause #295
-    // NOTE: H2 v2 issue: https://github.com/h2database/h2database/issues/3621
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoH2Latest.class })
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testReusedNestedCte2() {
         CriteriaBuilder<ParameterOrderCte> cteBuilder = cbf.create(em, ParameterOrderCte.class)
                 .withRecursive(TestCTE.class)
@@ -277,9 +263,8 @@ public void testReusedNestedCte2() {
         cteBuilder.getResultList();
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
+    @Category({ NoEclipselink.class })
     public void testParameterBindingOrder() {
         CriteriaBuilder<ParameterOrderEntity> cteBuilder = cbf.create(em, ParameterOrderEntity.class)
                 .with(ParameterOrderCte.class)
@@ -305,9 +290,8 @@ public void testParameterBindingOrder() {
         Assert.assertEquals(1, resultList.size());
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
+    @Category({ NoEclipselink.class })
     public void testParameterBindingOrderPaginated() {
         CriteriaBuilder<ParameterOrderEntity> cteBuilder = cbf.create(em, ParameterOrderEntity.class)
                 .with(ParameterOrderCte.class)
@@ -335,7 +319,7 @@ public void testParameterBindingOrderPaginated() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testParameterBindingOrderNested() {
         CriteriaBuilder<ParameterOrderEntity> cteBuilder = cbf.create(em, ParameterOrderEntity.class)
                 .with(ParameterOrderCte.class)
@@ -366,9 +350,8 @@ public void testParameterBindingOrderNested() {
         Assert.assertEquals(1, resultList.size());
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
+    @Category({ NoEclipselink.class })
     public void testParameterBindingOrderNestedPaginated() {
         CriteriaBuilder<ParameterOrderEntity> cteBuilder = cbf.create(em, ParameterOrderEntity.class)
                 .with(ParameterOrderCte.class)
@@ -404,7 +387,7 @@ public void testParameterBindingOrderNestedPaginated() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testInlineCTE() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2");
         cb.with(TestCTE.class, true)
@@ -425,7 +408,7 @@ public void testInlineCTE() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testInlineCTENullExpression() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2");
         cb.with(TestCTE.class, true)
@@ -445,7 +428,7 @@ public void testInlineCTENullExpression() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testInlineCTEWithParam() {
         CriteriaBuilder<TestCTE> cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2");
         cb.with(TestCTE.class, true)
@@ -464,9 +447,8 @@ public void testInlineCTEWithParam() {
         assertEquals(2, resultList.size());
     }
 
-    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
+    @Category({ NoEclipselink.class })
     public void testInlineCTEInCorrelatedSubquery() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class, "r")
                 .whereExists()
@@ -490,7 +472,7 @@ public void testInlineCTEInCorrelatedSubquery() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testInlineEntityWithLimit() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .fromEntitySubquery(RecursiveEntity.class, "t")
@@ -509,7 +491,7 @@ public void testInlineEntityWithLimit() {
 
     // Test for #1285
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testJoinOnSubquery() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .from(RecursiveEntity.class, "t")
@@ -532,10 +514,8 @@ public void testJoinOnSubquery() {
         assertEquals(1, resultList.size());
     }
 
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // NOTE: Hibernate 5.1 renders t.id = tSub.id rather than t = tSub
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class})
+    @Category({ NoEclipselink.class })
     public void testMultipleInlineEntityWithLimitJoin() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .fromEntitySubquery(RecursiveEntity.class, "t")
@@ -567,9 +547,8 @@ public void testMultipleInlineEntityWithLimitJoin() {
         assertEquals(1, resultList.size());
     }
 
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class })
     public void testJoinInlineEntityWithLimit() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .fromValues(RecursiveEntity.class, "name", "val", Collections.singletonList("child1_1"))
@@ -590,10 +569,9 @@ public void testJoinInlineEntityWithLimit() {
         assertEquals(1, resultList.size());
     }
 
-    // NOTE: H2 and old MySQL do not support lateral joins
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
+    // NOTE: H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinLateralEntityWithLimit() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .fromValues(RecursiveEntity.class, "name", "val", Collections.singletonList("child1_1"))
@@ -615,10 +593,9 @@ public void testJoinLateralEntityWithLimit() {
         assertEquals(1, resultList.size());
     }
 
-    // NOTE: H2 and old MySQL do not support lateral joins
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
+    // NOTE: H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinLateralCorrelationEntityWithLimit() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .from(RecursiveEntity.class, "x")
@@ -630,7 +607,7 @@ public void testJoinLateralCorrelationEntityWithLimit() {
                     .on("1").eqExpression("1")
                 .end()
                 .select("t");
-        String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity r WHERE r.parent.id = x.id ORDER BY r.name ASC LIMIT 1";
+        String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM x.children r ORDER BY r.name ASC LIMIT 1";
         String expected = ""
                 + "SELECT t FROM RecursiveEntity x LEFT JOIN LATERAL RecursiveEntity(" + expectedSubquery + ") t(id, name, parent.id)" + onClause("1 = 1") + " WHERE x.name = :param_0";
 
@@ -639,10 +616,9 @@ public void testJoinLateralCorrelationEntityWithLimit() {
         assertEquals(1, resultList.size());
     }
 
-    // NOTE: H2 and old MySQL do not support lateral joins
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
+    // NOTE: H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinLateralCorrelationEntityJoinTableWithLimit() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .from(RecursiveEntity.class, "x")
@@ -664,10 +640,9 @@ public void testJoinLateralCorrelationEntityJoinTableWithLimit() {
     }
 
     // Test for #1193
-    // NOTE: H2 and old MySQL do not support lateral joins
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
+    // NOTE: H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinLateralWithArrayExpressionImplicitJoin() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .from(RecursiveEntity.class, "x")
@@ -684,19 +659,16 @@ public void testJoinLateralWithArrayExpressionImplicitJoin() {
     }
 
     // Additional test for #1193
-    // NOTE: H2 and old MySQL do not support lateral joins
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
+    // NOTE: H2 does not support lateral joins
     @Test
-//    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
-    // NOTE: This requires joins to be ordered correctly which is only fixed in Hibernate 5.4.22+. Also see https://hibernate.atlassian.net/browse/HHH-14201
-    @Ignore
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinLateralWithElementArrayExpressionImplicitJoin() {
         CriteriaBuilder<RecursiveEntity> cb = cbf.create(em, RecursiveEntity.class)
                 .from(RecursiveEntity.class, "x")
                 .leftJoinLateralEntitySubquery("x.children[name = x.parent.name]", "t", "r").end()
                 .where("x.name").eq("root1")
                 .select("t");
-        String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity x_children_base, RecursiveEntity x_parent_base LEFT JOIN x_parent_base.parent parent_1 JOIN x_children_base.children r ON (r.name = parent_1.name) WHERE x.id = x_children_base.id AND x.id = x_parent_base.id";
+        String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity x_children_base CROSS JOIN RecursiveEntity x_parent_base LEFT JOIN x_parent_base.parent parent_1 JOIN x_children_base.children r ON (r.name = parent_1.name) WHERE x.id = x_children_base.id AND x.id = x_parent_base.id";
         String expected = ""
                 + "SELECT t FROM RecursiveEntity x LEFT JOIN LATERAL RecursiveEntity(" + expectedSubquery + ") t(id, name, parent.id)" + onClause("1 = 1") + " WHERE x.name = :param_0";
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java
index ba18bf7717..0b43237563 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java
@@ -5,14 +5,8 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.tx.TxWork;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -20,22 +14,21 @@
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.InsertCriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.entity.DeletePersonCTE;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.PersonCTE;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.testsuite.tx.TxWork;
+import jakarta.persistence.EntityManager;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -43,6 +36,7 @@
  * @since 1.1.0
  */
 // NOTE: Oracle is problematic due to #306
+// Can't run these tests with MySQL
 public class InsertTest extends AbstractCoreTest {
     
     private Person p1;
@@ -74,7 +68,7 @@ public void work(EntityManager em) {
     }
     
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testSimple() {
         transactional(new TxVoidWork() {
             @Override
@@ -98,7 +92,7 @@ public void work(EntityManager em) {
     }
     
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testSimpleWithLimit() {
         transactional(new TxVoidWork() {
             @Override
@@ -123,7 +117,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testSimpleWithLimitAndOffset() {
         transactional(new TxVoidWork() {
             @Override
@@ -148,9 +142,8 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: hibernate 4.2 does not support using parameters in the select clause
     @Test
-    @Category({ NoHibernate42.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testSimpleWithParameters() {
         transactional(new TxVoidWork() {
             @Override
@@ -177,7 +170,7 @@ public void work(EntityManager em) {
     
     // NOTE: H2 does not support returning all generated keys
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAll() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -206,7 +199,7 @@ public ReturningResult<Long> work(EntityManager em) {
     }
     
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLast() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -233,7 +226,7 @@ public ReturningResult<Long> work(EntityManager em) {
     }
     
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLastWithParameter() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -262,7 +255,7 @@ public ReturningResult<Long> work(EntityManager em) {
     
     // TODO: This does not work with sequences for H2 because the next value of the sequence is evaluated regardless of the limit
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLastWithLimit() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -290,9 +283,8 @@ public ReturningResult<Long> work(EntityManager em) {
     }
 
     // NOTE: H2 and MySQL only support returning generated keys
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoEclipselink.class })
     public void testReturningLastWithCte() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -331,9 +323,8 @@ public ReturningResult<Long> work(EntityManager em) {
     }
 
     // NOTE: H2 and MySQL only support returning generated keys
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLastWithCteAndLimit() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -372,9 +363,8 @@ public ReturningResult<Long> work(EntityManager em) {
     }
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
-    // NOTE: hibernate 4.2 does not support using parameters in the select clause
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testDeleteReturningWithCteAndLimitInto() {
         ReturningResult<Long> result = transactional(new TxWork<ReturningResult<Long>>() {
             @Override
@@ -414,9 +404,8 @@ public ReturningResult<Long> work(EntityManager em) {
     }
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
-    // NOTE: hibernate 4.2 does not support using parameters in the select clause
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testInsertReturningSelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -455,9 +444,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
-    // NOTE: hibernate 4.2 does not support using parameters in the select clause
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testInsertReturningSelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -495,9 +483,8 @@ public void work(EntityManager em) {
     }
 
     // Test for #1737
-    // NOTE: hibernate 4.2 does not support using parameters in the select clause
     @Test
-    @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class })
+    @Category({ NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testAssociationParameter() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java
index a55c7ba94e..fdcabb80ef 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java
@@ -4,11 +4,15 @@
  */
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Function;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.DeletePersonCTE;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
@@ -17,13 +21,7 @@
 import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.entity.Workflow;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.HashSet;
-import java.util.List;
-import java.util.function.Function;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -81,7 +79,7 @@ public void work(EntityManager em) {
 
     // Test for issue #1114
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoH2.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testLimitedCteWithoutLimitInMainQueryButWithCollectionFetch() {
         Function<Integer, List<Person>> fetchPersonBatch = batch ->
             cbf.create(em, Person.class)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1228Test.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1228Test.java
index d45215674c..eb0a9b2a18 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1228Test.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1228Test.java
@@ -9,8 +9,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import org.junit.Test;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java
index 50a447a97f..1f9577be9f 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java
@@ -5,35 +5,30 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.io.Serializable;
+import java.util.Objects;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
 import com.blazebit.persistence.CTE;
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.impl.query.CustomSQLTypedQuery;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.IdClassEntity;
 import com.blazebit.persistence.testsuite.entity.IdClassEntityId;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
-
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.ManyToOne;
-import java.io.Serializable;
-import java.util.Objects;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.ManyToOne;
 
 import static org.junit.Assert.assertEquals;
 
@@ -64,8 +59,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // Ignore MySQL / Oracle because of unsupported use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class })
+    // Ignore MySQL / Oracle because of unsupported use of CTE's
+    @Category({ NoEclipselink.class, NoOracle.class })
     public void testBindingCteAssociationToEntity() {
         transactional(new TxVoidWork() {
             @Override
@@ -104,8 +99,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // Ignore MySQL / Oracle because of unsuppored use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class  })
+    // Ignore MySQL / Oracle because of unsuppored use of CTE's
+    @Category({ NoEclipselink.class, NoOracle.class  })
     public void testBindingCteAssociationToEntityId() {
         expectedException.expectMessage("An association should be bound to its association type and not its identifier type");
 
@@ -148,7 +143,7 @@ public void work(EntityManager em) {
 
     @Test
     // Ignore MySQL / Oracle because of unsuppored use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class  })
+    @Category({ NoEclipselink.class, NoOracle.class  })
     public void testBindingCteAssociationIdToEntityId() {
         transactional(new TxVoidWork() {
             @Override
@@ -188,8 +183,8 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // Ignore MySQL / Oracle because of unsupported use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class  })
+    // Ignore MySQL / Oracle because of unsupported use of CTE's
+    @Category({ NoEclipselink.class, NoOracle.class  })
     public void testBindingCteUsingNestedIdClass() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java
index 2dbc5c2aed..60387d9b0d 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java
@@ -5,21 +5,15 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
-import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -125,7 +119,6 @@ public void testLeftJoinOnSubquery() {
     }
 
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class})
     public void testJoinAvoidance() {
         CriteriaBuilder<String> crit = cbf.create(em, String.class).from(Document.class, "e");
         crit.select("e.responsiblePerson.name");
@@ -148,7 +141,7 @@ public void testJoinAvoidance() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class })
     // NOTE: Subquery support in ON clause is only possible with Hibernate 5.1+
     // TODO: report eclipselink does not support subqueries in functions
     public void testJoinWithSubqueryBuilder() {
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java
index 9ceb806bb6..f72cc9c0a9 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java
@@ -5,26 +5,8 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps;
-import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps;
-import com.blazebit.persistence.testsuite.entity.Version;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -32,8 +14,19 @@
 import com.blazebit.persistence.JoinType;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
 import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps;
 import com.blazebit.persistence.testsuite.entity.Person;
+import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps;
+import com.blazebit.persistence.testsuite.entity.Version;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -368,8 +361,6 @@ public void selectWithFetchMultipleRelations() {
     }
 
     @Test
-    // Older Hibernate versions don't like fetch joining an element collection at all: https://hibernate.atlassian.net/browse/HHH-11140
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
     public void selectWithFetchElementCollectionOnly() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "a");
         crit.select("owner");
@@ -468,7 +459,7 @@ public void testPaginatedJoinFetch(){
     // NOTE: DB2 9.7 which is what we've got on Travis CI does not support subqueries in the on clause. See http://www-01.ibm.com/support/knowledgecenter/SSEPGG_9.7.0/com.ibm.db2.luw.messages.sql.doc/doc/msql00338n.html?cp=SSEPGG_9.7.0
     // NOTE: Hibernate < 5.1 need to refer to other from clause elements which isn't supported until 5.1
     @Test
-    @Category({ NoDB2.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoDB2.class })
     public void testSizeInOnClause() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d")
             .leftJoinOn("d.partners", "p").on("SIZE(d.versions)").gtExpression("2").end();
@@ -519,7 +510,7 @@ public void work(EntityManager em) {
 
     @Test
     // Only hibernate supports single valued association id expressions without needing to join
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testEntityJoinEmulationReverseJoinDependencyBug() {
         CriteriaBuilder<Long> crit = cbf.create(em, Long.class)
                 .from(Document.class, "d")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java
index d5f772d2ba..3c6395ffc5 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java
@@ -5,40 +5,34 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import javax.persistence.EntityManager;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.spi.JpqlFunction;
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatement;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
+import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentType;
+import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import jakarta.persistence.EntityManager;
 
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -162,7 +156,7 @@ public void builtinFunctionsReturnCorrectTypes() {
     }
 
     @Test
-    @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoH2.class, NoMSSQL.class, NoEclipselink.class})
+    @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoH2.class, NoMSSQL.class, NoEclipselink.class})
     public void testCastFunctionWithTargetTypeOverrideMysql() {
         testCastFunctionWithTargetTypeOverride("unsigned");
     }
@@ -192,7 +186,7 @@ public void validate(String query) {
     }
 
     @Test
-    @Category({ NoHibernate.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoHibernate.class })
     public void testCastFunctionWithTargetTypeOverrideEclipselink() {
         final String castTypeOverride = "smallint";
         CriteriaBuilder<Integer> cb = cbf.create(em, Integer.class).from(Document.class, "d")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java
index b9f5c9a484..e4a58574c1 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java
@@ -5,27 +5,26 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.parser.JsonParser;
 import com.blazebit.persistence.parser.XmlParser;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -71,7 +70,7 @@ public void work(EntityManager em) {
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
     // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class })
+    @Category({ NoEclipselink.class, NoDB2.class })
     public void testToStringJson() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
                 .from(Person.class, "p")
@@ -95,7 +94,7 @@ public void testToStringJson() {
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
     // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class })
+    @Category({ NoEclipselink.class, NoDB2.class })
     public void testToStringXml() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
                 .from(Person.class, "p")
@@ -157,7 +156,7 @@ public void testStringXmlAgg() {
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
     // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class })
+    @Category({ NoEclipselink.class, NoDB2.class })
     public void testToMultiset() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
                 .from(Person.class, "p")
@@ -181,7 +180,7 @@ public void testToMultiset() {
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
     // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class })
+    @Category({ NoEclipselink.class, NoDB2.class })
     public void testNestedToMultiset() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
                 .from(Person.class, "p")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java
index f5f0e92e33..9073a2fb24 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java
@@ -4,25 +4,24 @@
  */
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.JsonDocument;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Moritz Becker
@@ -56,7 +55,7 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoH2.class, NoSQLite.class, NoFirebird.class })
+    @Category({ NoH2.class })
     public void testJsonGetWithLiteralPathElements() throws JsonProcessingException {
         List<Tuple> objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d")
                 .select("d.content")
@@ -102,7 +101,7 @@ public void testJsonGetWithLiteralPathElements() throws JsonProcessingException
     }
 
     @Test
-    @Category({ NoH2.class, NoSQLite.class, NoFirebird.class })
+    @Category({ NoH2.class })
     public void testJsonGetWithLiteralJsonPath() throws JsonProcessingException {
         List<Tuple> objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d")
             .select("d.content")
@@ -124,7 +123,7 @@ public void testJsonGetWithLiteralJsonPath() throws JsonProcessingException {
     }
 
     @Test
-    @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoOracle.class })
+    @Category({ NoH2.class, NoOracle.class })
     public void testJsonGetWithParameterizedJsonPath() throws JsonProcessingException {
         List<Tuple> objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d")
             .select("d.content")
@@ -160,7 +159,7 @@ public void testJsonGetWithParameterizedJsonPath() throws JsonProcessingExceptio
     }
 
     @Test
-    @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoMySQLOld.class })
+    @Category({ NoH2.class })
     public void testJsonSet() throws JsonProcessingException {
         List<Tuple> objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d")
                 .select("d.content")
@@ -205,7 +204,7 @@ public void testJsonSet() throws JsonProcessingException {
     }
 
     @Test
-    @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoH2.class, NoOracle.class })
     public void testJsonSetNull() throws JsonProcessingException {
         List<Tuple> objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d")
                 .select("d.content")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationNullsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationNullsTest.java
index f4da7b7031..a664dd3f88 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationNullsTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationNullsTest.java
@@ -16,8 +16,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationPage1EdgeCaseFallbackTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationPage1EdgeCaseFallbackTest.java
index 6b56d91476..0c0f852f1a 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationPage1EdgeCaseFallbackTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationPage1EdgeCaseFallbackTest.java
@@ -16,8 +16,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationTest.java
index b4ffb0a8bf..914d490d43 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/KeysetPaginationTest.java
@@ -20,8 +20,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java
index f9a57dea3f..9bf0ece6fe 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java
@@ -5,17 +5,18 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.DeletePersonCTE;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
@@ -23,11 +24,7 @@
 import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.entity.Workflow;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -87,8 +84,9 @@ public void testSubqueryLimit() {
     }
     
     @Test
-    @Category(NoEclipselink.class)
+    // MySQL doesn't support limit in subquery of IN predicate
     // TODO: report eclipselink does not support subqueries in functions
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testSubqueryAndOuterQueryLimit() {
         CriteriaBuilder<Person> cb = cbf.create(em, Person.class, "p");
         cb.where("p.id").in()
@@ -109,7 +107,7 @@ public void testSubqueryAndOuterQueryLimit() {
 
     // Test for issue #774
     @Test
-    @Category({NoH2.class, NoDB2.class, NoFirebird.class, NoMSSQL.class, NoMySQL.class, NoOracle.class, NoSQLite.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class})
+    @Category({NoH2.class, NoDB2.class, NoMSSQL.class, NoMySQL.class, NoOracle.class, NoEclipselink.class })
     public void testModificationCteQueryWithLimitInMainQuery() {
         List<DeletePersonCTE> deletedPersons = cbf.create(em, DeletePersonCTE.class)
                 .withReturning(DeletePersonCTE.class)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ListaggTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ListaggTest.java
index 3012f15afb..836c527685 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ListaggTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ListaggTest.java
@@ -16,8 +16,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinComplexExpressionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinComplexExpressionTest.java
index 4248d7db4a..c42f071192 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinComplexExpressionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinComplexExpressionTest.java
@@ -9,7 +9,7 @@
 
 import java.util.Locale;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import org.junit.Test;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinTest.java
index 37d933fc4e..4288fc35e8 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/MultipleJoinTest.java
@@ -9,7 +9,7 @@
 
 import java.util.Locale;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import org.junit.Test;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java
index 818c17d7a1..4a934d9099 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java
@@ -7,16 +7,7 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.UpdateCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity;
 import com.blazebit.persistence.testsuite.entity.Document;
@@ -28,7 +19,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -58,7 +49,7 @@ protected Class<?>[] getEntityClasses() {
 
     @Test
     // NOTE: Only Hibernate supports the single values association id access optimization, but doesn't do it for natural ids yet
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class})
+    @Category({NoEclipselink.class})
 //    @Category({ NoDatanucleus.class, NoOpenJPA.class })
     public void testNonPrimaryKeySingleValuedAssociationId() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "ref")
@@ -71,7 +62,7 @@ public void testNonPrimaryKeySingleValuedAssociationId() {
 
     @Test
     // NOTE: Only Hibernate supports the single values association id access optimization, but doesn't do it for natural ids yet
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class})
+    @Category({NoEclipselink.class})
 //    @Category({ NoDatanucleus.class, NoOpenJPA.class })
     public void testNonPrimaryKeySingleValuedAssociationId2() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class)
@@ -83,7 +74,6 @@ public void testNonPrimaryKeySingleValuedAssociationId2() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoOpenJPA.class })
     public void testNonPrimaryKeySingleValuedAssociationId3() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class)
                 .innerJoin("book", "b")
@@ -95,7 +85,6 @@ public void testNonPrimaryKeySingleValuedAssociationId3() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoOpenJPA.class })
     public void testNonPrimaryKeySingleValuedAssociationId4() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "r")
                 .innerJoinOn("book", "b")
@@ -110,7 +99,7 @@ public void testNonPrimaryKeySingleValuedAssociationId4() {
 
     // NOTE: No JPA provider supports the optimized natural id access and only EclipseLink and Hibernate seem to support natural ids
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class})
+    @Category({NoEclipselink.class})
     public void testNonPrimaryKeySingleValuedAssociationId5() {
         CriteriaBuilder<Tuple> cb1 = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "r")
                 .innerJoinOn("bookNormal", "b")
@@ -132,7 +121,7 @@ public void testNonPrimaryKeySingleValuedAssociationId5() {
 
     // NOTE: No JPA provider supports the optimized natural id access and only EclipseLink and Hibernate seem to support natural ids
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class})
+    @Category({NoEclipselink.class})
     public void testNonPrimaryKeySingleValuedAssociationIdInUpdate() {
         Person owner = new Person("p1");
         BookEntity bookEntity = new BookEntity();
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java
index c6f87af488..82e2bc0e38 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java
@@ -5,21 +5,6 @@
 
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.ConfigurationProperties;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.entity.KeysetEntity2;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,6 +13,20 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import com.blazebit.persistence.ConfigurationProperties;
+import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.PagedList;
+import com.blazebit.persistence.PaginatedCriteriaBuilder;
+import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
+import com.blazebit.persistence.testsuite.entity.KeysetEntity2;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -36,9 +35,6 @@
  * @author Moritz Becker
  * @since 1.2.0
  */
-// DataNucleus has a bug with null precedence rendering
-// see https://github.com/datanucleus/datanucleus-rdbms/issues/224
-@Category({ NoDatanucleus.class })
 @RunWith(Parameterized.class)
 public class OptimizedKeysetPaginationNullsTest extends AbstractCoreTest {
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationPage1EdgeCaseFallbackTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationPage1EdgeCaseFallbackTest.java
index 871811c9b9..6b54f667a8 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationPage1EdgeCaseFallbackTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationPage1EdgeCaseFallbackTest.java
@@ -19,8 +19,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationRowValueConstructorTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationRowValueConstructorTest.java
index 52f6648d04..03bdb73977 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationRowValueConstructorTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationRowValueConstructorTest.java
@@ -22,8 +22,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationTest.java
index 10bc9c4266..f854f837a2 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationTest.java
@@ -24,8 +24,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java
index f7ef71e16e..f51a35cbed 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java
@@ -5,24 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.entity.Person;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.Criteria;
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.parser.expression.SyntaxErrorException;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 import com.blazebit.persistence.testsuite.entity.Document;
-import org.junit.experimental.categories.Category;
+import com.blazebit.persistence.testsuite.entity.Person;
+import jakarta.persistence.Tuple;
 
-import javax.persistence.Tuple;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -171,8 +168,6 @@ public void testOrderByFunctionExpression() {
     }
 
     @Test
-    // TODO: Report datanucleus issue
-    @Category({ NoDatanucleus.class })
     public void testOrderByAliasedCaseWhen() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d");
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java
index ff8b10fd70..bd1a998cb6 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java
@@ -5,21 +5,23 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PagedList;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.entity.*;
+import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
+import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer;
+import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
+import com.blazebit.persistence.testsuite.entity.IntIdEntity;
+import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,8 +31,7 @@
  * @since 1.2.0
  */
 // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062
-// TODO: report that datanucleus doesn't support element collection in an embeddable
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class PaginationEmbeddedIdTest extends AbstractCoreTest {
 
     @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationOneToOneTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationOneToOneTest.java
index 9891c5004c..d865aa8b5f 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationOneToOneTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationOneToOneTest.java
@@ -14,8 +14,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java
index 33bb172925..e7b0d53fd7 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java
@@ -5,36 +5,35 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.DefaultKeyset;
 import com.blazebit.persistence.DefaultKeysetPage;
 import com.blazebit.persistence.PagedList;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Workflow;
 import com.blazebit.persistence.testsuite.model.DocumentViewModel;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  *
@@ -383,8 +382,6 @@ public void testPaginationWithNotExistingReferenceObject() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupByExplicitPagination() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d";
         String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id") + " ORDER BY d.id ASC";
@@ -409,8 +406,6 @@ public void testPaginatedWithGroupByExplicitPagination() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupBy1() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id, "+ "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC";
@@ -435,8 +430,6 @@ public void testPaginatedWithGroupBy1() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupBy2() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC";
@@ -464,8 +457,6 @@ public void testPaginatedWithGroupBy2() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupBy3() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC";
@@ -493,8 +484,6 @@ public void testPaginatedWithGroupBy3() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupBy4() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC";
@@ -522,8 +511,6 @@ public void testPaginatedWithGroupBy4() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testPaginatedWithGroupBy5() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id, "+ "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "d.name", "strings_1") + " ORDER BY d.name ASC, d.id ASC";
@@ -551,9 +538,8 @@ public void testPaginatedWithGroupBy5() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
     // Eclipselink does not render the table alias necessary for the path expression in the count function...
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testPaginatedWithGroupBy6() {
         String expectedCountQuery = "SELECT " + countPaginated("d.name, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.name, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.name", "strings_1", renderNullPrecedenceGroupBy("strings_1", "ASC", "LAST")) + " ORDER BY d.name ASC, " + renderNullPrecedence("strings_1", "ASC", "LAST");
@@ -581,9 +567,8 @@ public void testPaginatedWithGroupBy6() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
     // Eclipselink does not render the table alias necessary for the path expression in the count function...
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testPaginatedWithGroupBy7() {
         String expectedCountQuery = "SELECT " + countPaginated("d.name, d.age, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1";
         String expectedIdQuery = "SELECT d.name, d.age, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.name", "strings_1", "d.age", renderNullPrecedenceGroupBy("strings_1", "ASC", "LAST")) + " ORDER BY d.name ASC, d.age ASC, " + renderNullPrecedence("strings_1", "ASC", "LAST");
@@ -611,9 +596,8 @@ public void testPaginatedWithGroupBy7() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
     // Eclipselink does not render the table alias necessary for the path expression in the count function...
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testPaginatedWithGroupBy8() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d";
         String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id", "d.name", "d.age") + " ORDER BY d.name ASC, d.age ASC, d.id ASC";
@@ -645,9 +629,8 @@ public void testPaginatedWithGroupBy8() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
     // Eclipselink does not render the table alias necessary for the path expression in the count function...
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testPaginatedWithGroupBy9() {
         String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d";
         String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id") + " ORDER BY d.id ASC";
@@ -867,8 +850,6 @@ public void testOrderBySizeAlias() {
     }
 
     @Test
-    // Apparently, Datanucleus doesn't like it when using a joined element collection in a function
-    @Category(NoDatanucleus.class)
     public void testOrderBySizeAlias2() {
         PaginatedCriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
                 .select("SIZE(d.contacts)", "contactCount")
@@ -930,7 +911,7 @@ public void testSelectOnlyPropagationForWithJoins2() {
 
     @Test
     // Not sure what datanucleus does here..
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipse bug, the expression "VALUE(c) IS NULL" seems illegal but JPA spec 4.6.11 allows it
     public void testSelectOnlyPropagationForWithJoins3() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d");
@@ -952,7 +933,7 @@ public void testSelectOnlyPropagationForWithJoins3() {
 
     @Test
     // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testCountWithExplicitLeftJoin() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
                 .leftJoinOn(Person.class, "p")
@@ -966,7 +947,7 @@ public void testCountWithExplicitLeftJoin() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testPaginateSimpleAggregate() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d")
@@ -1173,8 +1154,9 @@ public void testOrderBySingleValuesAssociationId() {
     }
 
     @Test
-    @Category(NoEclipselink.class)
+    // MySQL doesn't support limit in subquery of IN predicate
     // TODO: report eclipselink does not support subqueries in functions
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testExtractIdQueryIntoSubquery() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class)
                 .from(Document.class, "doc")
@@ -1192,7 +1174,7 @@ public void testExtractIdQueryIntoSubquery() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void testBoundedCountSimpleExternal() {
         PaginatedCriteriaBuilder<Document> cb = cbf.create(em, Document.class, "d")
@@ -1208,7 +1190,7 @@ public void testBoundedCountSimpleExternal() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void testBoundedCountSimpleInline() {
         PaginatedCriteriaBuilder<Document> cb = cbf.create(em, Document.class, "d")
@@ -1223,7 +1205,7 @@ public void testBoundedCountSimpleInline() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void testBoundedCountAdvancedExternal() {
         PaginatedCriteriaBuilder<Document> cb = cbf.create(em, Document.class, "d")
@@ -1241,7 +1223,7 @@ public void testBoundedCountAdvancedExternal() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void testBoundedCountAdvancedInline() {
         PaginatedCriteriaBuilder<Document> cb = cbf.create(em, Document.class, "d")
@@ -1258,9 +1240,7 @@ public void testBoundedCountAdvancedInline() {
     }
 
     // Test for #1209
-    // NOTE: DataNucleus renders the literal `(1)` for the byte array parameter on PostgreSQL which is wrong
     @Test
-    @Category({ NoDatanucleus.class })
     public void testPaginationImplicitGroupByWithParameter() {
         PaginatedCriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d")
@@ -1273,8 +1253,7 @@ public void testPaginationImplicitGroupByWithParameter() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testUsePaginatedCriteriaBuilderCopyAsSubquery() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ParameterAPITest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ParameterAPITest.java
index df24a1b412..d8dcad7efb 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ParameterAPITest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ParameterAPITest.java
@@ -11,9 +11,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.Tuple;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Tuple;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Set;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java
index 760ac8dbb7..eb9a02e3eb 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java
@@ -7,10 +7,11 @@
 
 import static org.junit.Assert.assertTrue;
 
-import javax.persistence.Tuple;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer;
 import org.junit.Test;
 
@@ -28,7 +29,7 @@
  * @since 1.0.0
  */
 // NOTE: Hibernate 6.0 supports this when only a single subtype contains the attribute
-@Category(NoHibernate60.class)
+@Category(NoHibernate.class)
 public class PolymorphicJoinTest extends AbstractCoreTest {
     
     @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java
index d3d56a6e11..067599cd89 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java
@@ -6,7 +6,8 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer;
@@ -27,7 +28,7 @@
  * @since 1.0.0
  */
 // NOTE: Hibernate 6.0 supports this when only a single subtype contains the attribute
-@Category(NoHibernate60.class)
+@Category(NoHibernate.class)
 public class PolymorphicPropertyTest extends AbstractCoreTest {
     
     @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java
index 51f50146f8..b2a8bbe66e 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java
@@ -5,20 +5,17 @@
 
 package com.blazebit.persistence.testsuite;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
+import java.util.Properties;
+
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.TypedQuery;
-import java.util.List;
-import java.util.Properties;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.Person;
+import jakarta.persistence.TypedQuery;
 
 /**
  * @author Christian Beikov
@@ -60,7 +57,7 @@ public final void tearDown() {
 
     // Apparently, only Hibernate is able to cache scalar queries...
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void queryResultCachingTest() {
         TypedQuery<String> query = cbf.create(em, String.class)
                 .from(Document.class)
@@ -80,7 +77,7 @@ public void queryResultCachingTest() {
 
     // Apparently, only Hibernate is able to cache scalar queries...
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void queryResultCachingWithObjectBuilderTest() {
         TypedQuery<TestObject> query = cbf.create(em, String.class)
                 .from(Document.class)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java
index 50620e9844..36d680f8e6 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java
@@ -5,11 +5,10 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.entity.RawTypeEntity;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  * This test is for issue #344
@@ -26,9 +25,7 @@ protected Class<?>[] getEntityClasses() {
         };
     }
 
-    // NOTE: Datanucleus does not support the MapKeyClass yet: https://github.com/datanucleus/datanucleus-core/issues/185
     @Test
-    @Category({ NoDatanucleus.class })
     public void buildingQueryWithEntityThatUsesRawTypesWorks() {
         CriteriaBuilder<RawTypeEntity> criteria = cbf.create(em, RawTypeEntity.class, "d");
         criteria.select("d.list.id");
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java
index 970acacd11..094a8a9d98 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java
@@ -5,13 +5,14 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.UpdateCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
 import com.blazebit.persistence.testsuite.entity.SecondaryTableEntityBase;
 import com.blazebit.persistence.testsuite.entity.SecondaryTableEntitySub;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,9 +38,9 @@ public void secondaryTableWithJoinedInheritanceTest() {
         assertFalse(criteria.getResultList().isEmpty());
     }
 
+    // NOTE: Hibernate ORM bug: https://hibernate.atlassian.net/browse/HHH-18813
     @Test
-    // DataNucleus doesn't handle that properly
-    @Category({ NoDatanucleus.class })
+    @Category({ NoHibernate.class } )
     public void updateSecondaryTableAttribute() {
         SecondaryTableEntitySub b = new SecondaryTableEntitySub();
         b.setB(4L);
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewObjectBuilderTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewObjectBuilderTest.java
index 4de275b4d0..23a101288f 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewObjectBuilderTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewObjectBuilderTest.java
@@ -14,7 +14,7 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewTest.java
index f34cf3b541..9f67da5648 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectNewTest.java
@@ -15,7 +15,7 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Constructor;
 import java.util.List;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java
index aaa6db5363..50967a88fb 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java
@@ -5,22 +5,20 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.TPCBase;
 import com.blazebit.persistence.testsuite.entity.TPCSub1;
 import com.blazebit.persistence.testsuite.entity.TPCSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -54,9 +52,8 @@ public void work(EntityManager em) {
         });
     }
 
-    // NOTE: MySQL has no CTE support
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testSelectTablePerClassWithCte() throws Exception {
         CriteriaBuilder<TPCBase> cb = cbf.create(em, TPCBase.class, "t")
                 .with(IdHolderCTE.class, false)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectTest.java
index 2a03976466..67a941d2b9 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectTest.java
@@ -10,8 +10,8 @@
 import java.util.Calendar;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.entity.DocumentType;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java
index 245d98ad93..6851cde109 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java
@@ -5,12 +5,11 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.FinalSetOperationCriteriaBuilder;
@@ -21,19 +20,17 @@
 import com.blazebit.persistence.StartOngoingSetOperationCriteriaBuilder;
 import com.blazebit.persistence.impl.BuilderChainingException;
 import com.blazebit.persistence.spi.SetOperationType;
-import com.blazebit.persistence.testsuite.entity.*;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
+import com.blazebit.persistence.testsuite.entity.Person;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Firebird like MySQL do not support intersect and except operators.
@@ -87,7 +84,7 @@ public void setUp() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testPrecedence() {
         FinalSetOperationCriteriaBuilder<String> cb = cbf.create(em, String.class)
                     .from(Document.class, "d1")
@@ -116,7 +113,7 @@ public void testPrecedence() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testObjectBuilder() {
         FinalSetOperationCriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d1")
@@ -142,7 +139,7 @@ public void testObjectBuilder() {
     }
     
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testUnionAll() {
         FinalSetOperationCriteriaBuilder<String> cb = cbf.create(em, String.class)
                 .from(Document.class, "d1")
@@ -166,7 +163,7 @@ public void testUnionAll() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testUnionAllOrderBy() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d1")
@@ -192,7 +189,7 @@ public void testUnionAllOrderBy() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testUnionAllOrderBySubqueryLimit() {
         CriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d")
@@ -226,7 +223,7 @@ public void testUnionAllOrderBySubqueryLimit() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testUnionAllOrderByOperandLimit() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class)
@@ -255,7 +252,7 @@ public void testUnionAllOrderByOperandLimit() {
     }
     
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testUnion() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d1")
@@ -278,9 +275,8 @@ public void testUnion() {
     }
 
     @Test
-    // TODO: why no hibernate 4.2?
     // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate EXCEPT ALL
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testExceptAll() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d1")
@@ -303,7 +299,7 @@ public void testExceptAll() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testExcept() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d1")
@@ -326,9 +322,8 @@ public void testExcept() {
     }
 
     @Test
-    // TODO: why no hibernate 4.2?
     // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate INTERSECT ALL
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testIntersectAll() {
         FinalSetOperationCriteriaBuilder<String> cb = cbf.create(em, String.class)
                 .from(Document.class, "d1")
@@ -352,7 +347,7 @@ public void testIntersectAll() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testIntersect() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d1")
@@ -377,7 +372,7 @@ public void testIntersect() {
     /* Set operation nesting */
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testNestedIntersectWithUnion() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
             .startSet(em, Document.class)
@@ -412,7 +407,7 @@ public void testNestedIntersectWithUnion() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testIntersectWithNestedUnion() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class)
@@ -443,7 +438,7 @@ public void testIntersectWithNestedUnion() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testRightNesting() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class)
@@ -493,7 +488,7 @@ public void testRightNesting() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testLeftNesting() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
             .startSet(em, Document.class)
@@ -540,7 +535,7 @@ public void testLeftNesting() {
     }
     
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testLeftRightNesting() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
             .startSet(em, Document.class)
@@ -596,7 +591,7 @@ public void testLeftRightNesting() {
     }
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testAttributeOrderByLimit() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class)
@@ -642,7 +637,7 @@ public void testAttributeOrderByLimit() {
     }
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testAliasOrderByLimit() {
         FinalSetOperationCriteriaBuilder<String> cb = cbf.create(em, String.class)
                 .from(Document.class, "d1")
@@ -690,7 +685,7 @@ public void testAliasOrderByLimit() {
     
     // NOTE: H2 does not seem to support set operations in CTEs properly
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testCTENesting() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d")
@@ -763,7 +758,7 @@ public void testCTENesting() {
 
     // NOTE: H2 does not seem to support set operations in CTEs properly
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testCTERightNesting() {
         FinalSetOperationCriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d")
@@ -812,7 +807,7 @@ public void testCTERightNesting() {
 
     // NOTE: H2 does not seem to support set operations in CTEs properly
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testCTELeftNesting() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class)
                     .withStartSet(IdHolderCTE.class, false)
@@ -876,7 +871,7 @@ public void testCTELeftNesting() {
     /* Subquery set operations */
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testSubqueryNesting() {
         CriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d")
@@ -931,7 +926,7 @@ public void testSubqueryNesting() {
     }
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testSubqueryLeftNesting() {
         CriteriaBuilder<Document> cb = cbf
                 .create(em, Document.class, "d")
@@ -997,7 +992,7 @@ public void testSubqueryLeftNesting() {
 
     // NOTE: H2 does not seem to support set operations in subqueries with limit properly
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testSubqueryOrderByLimit() {
         CriteriaBuilder<String> cb = cbf.create(em, String.class)
                 .from(Document.class, "doc")
@@ -1047,7 +1042,7 @@ public void testSubqueryOrderByLimit() {
     }
 
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testWithStartSetEmpty() {
         final CriteriaBuilder<IdHolderCTE> cb = cbf.create(em, IdHolderCTE.class)
                 .withStartSet(IdHolderCTE.class, false)
@@ -1076,8 +1071,7 @@ public void testWithStartSetEmpty() {
     }
 
     @Test
-    // H2 broke in 1.4.198, will be fixed in 1.4.200
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class })
+    @Category({ NoEclipselink.class })
     public void testSetSubqueryAliasIsolation() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class)
                 .from(Document.class, "d1")
@@ -1109,7 +1103,7 @@ protected String setOperation(SetOperationType type, String... queries) {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNotEndedLeaf() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         LeafOngoingSetOperationCriteriaBuilder<Document> result = cb
@@ -1123,7 +1117,7 @@ public void testNotEndedLeaf() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNotEndedStart() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         StartOngoingSetOperationCriteriaBuilder<Document, LeafOngoingFinalSetOperationCriteriaBuilder<Document>> result = cb
@@ -1135,7 +1129,7 @@ public void testNotEndedStart() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNotEndedStartLeaf() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         LeafOngoingFinalSetOperationCriteriaBuilder<Document> result = cb
@@ -1147,7 +1141,7 @@ public void testNotEndedStartLeaf() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNotEndedOngoing() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         OngoingFinalSetOperationCriteriaBuilder<LeafOngoingFinalSetOperationCriteriaBuilder<Document>> result = cb
@@ -1159,7 +1153,7 @@ public void testNotEndedOngoing() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNotEndedOngoingLeaf() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         LeafOngoingFinalSetOperationCriteriaBuilder<Document> result = cb
@@ -1171,7 +1165,7 @@ public void testNotEndedOngoingLeaf() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testNotEndedSubqueryLeaf() {
         CriteriaBuilder<Document> cb = cbf.create(em, Document.class);
         FinalSetOperationSubqueryBuilder<CriteriaBuilder<Document>> result = cb
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationManyToOneTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationManyToOneTest.java
index 252ced2b16..efd2300974 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationManyToOneTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationManyToOneTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import com.blazebit.persistence.testsuite.entity.Document;
 import org.junit.Assert;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java
index e13112e1ec..1e7c924398 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java
@@ -6,15 +6,7 @@
 package com.blazebit.persistence.testsuite;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.DocumentForOneToOneJoinTable;
 import com.blazebit.persistence.testsuite.entity.DocumentForOneToOne;
 import com.blazebit.persistence.testsuite.entity.DocumentInfo;
@@ -23,7 +15,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,8 +24,6 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: Datanucleus generates wrong DDL for OneToOne JoinTable mappings: https://github.com/datanucleus/datanucleus-core/issues/196
-@Category({ NoDatanucleus.class })
 public class SingleValuedAssociationOneToOneJoinTableTest extends AbstractCoreTest {
 
     @Override
@@ -55,7 +45,6 @@ public void oneToOneJoinTableSingleValuedAssociationIsNull() {
     }
 
     @Test
-    @Category({NoHibernate52.class, NoHibernate53.class})
     public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccess() {
         Assume.assumeFalse(supportsTableGroupJoins());
 
@@ -66,7 +55,7 @@ public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccess() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class})
+    @Category({NoEclipselink.class})
     public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccessWithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -78,7 +67,6 @@ public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccessWithTableGro
     }
 
     @Test
-    @Category({NoHibernate52.class, NoHibernate53.class})
     public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccess() {
         Assume.assumeFalse(supportsTableGroupJoins());
 
@@ -89,7 +77,7 @@ public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccess() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class})
+    @Category({NoEclipselink.class})
     public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccessWithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -101,7 +89,6 @@ public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccessWithTableGro
     }
 
     @Test
-    @Category({NoHibernate52.class, NoHibernate53.class})
     public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1() {
         Assume.assumeFalse(supportsTableGroupJoins());
 
@@ -113,7 +100,7 @@ public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class})
+    @Category({NoEclipselink.class})
     public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1WithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -144,7 +131,7 @@ public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride3() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class})
+    @Category({NoEclipselink.class})
     public void leftJoinDereferenedForeignJoinTableWithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -157,7 +144,7 @@ public void leftJoinDereferenedForeignJoinTableWithTableGroupJoins() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class})
+    @Category({NoEclipselink.class})
     public void leftJoinDereferenedForeignJoinTableInverseWithTableGroupJoins() {
         Assume.assumeTrue(supportsTableGroupJoins());
 
@@ -170,7 +157,7 @@ public void leftJoinDereferenedForeignJoinTableInverseWithTableGroupJoins() {
     }
 
     @Test
-    @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class})
+    @Category({NoEclipselink.class})
     public void leftJoinDereferenedForeignJoinTable() {
         Assume.assumeFalse(supportsTableGroupJoins());
         Assume.assumeTrue(jpaProvider.supportsEntityJoin());
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneTest.java
index fbcc3e4e60..e835f78873 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneTest.java
@@ -11,7 +11,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java
index 7a2b064395..4251d40eb5 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java
@@ -5,24 +5,24 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.impl.function.subquery.SubqueryFunction;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.entity.Workflow;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,8 +33,6 @@
  */
 public class SizeTransformationTest extends AbstractCoreTest {
 
-    // TODO: create datanucleus issue
-    @Category(NoDatanucleus.class)
     @Test
     public void testSizeToCountTransformationWithElementCollectionIndexed1() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Workflow.class, "w")
@@ -44,8 +42,6 @@ public void testSizeToCountTransformationWithElementCollectionIndexed1() {
         cb.getResultList();
     }
 
-    // TODO: create datanucleus issue
-    @Category(NoDatanucleus.class)
     @Test
     public void testSizeToCountTransformationWithElementCollectionIndexed2() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Workflow.class, "w")
@@ -57,8 +53,6 @@ public void testSizeToCountTransformationWithElementCollectionIndexed2() {
         cb.getResultList();
     }
 
-    // TODO: create datanucleus issue
-    @Category(NoDatanucleus.class)
     @Test
     public void testSizeToCountTransformationWithElementCollectionBasic1() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Workflow.class, "w")
@@ -68,8 +62,6 @@ public void testSizeToCountTransformationWithElementCollectionBasic1() {
         cb.getResultList();
     }
 
-    // TODO: create datanucleus issue
-    @Category(NoDatanucleus.class)
     @Test
     public void testSizeToCountTransformationWithElementCollectionBasic2() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Workflow.class, "w")
@@ -107,6 +99,8 @@ public void testSizeToCountTransformationWithList1() {
     }
 
     @Test
+    // NOTE: Hibernate ORM bug: https://hibernate.atlassian.net/browse/HHH-18838
+    @Category({ NoOracle.class })
     public void testSizeToCountTransformationWithList2() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
                 .select("SIZE(d.people)")
@@ -132,6 +126,8 @@ public void testSizeToCountTransformationWithMap1() {
     }
 
     @Test
+    // NOTE: Hibernate ORM bug: https://hibernate.atlassian.net/browse/HHH-18838
+    @Category({ NoOracle.class })
     public void testSizeToCountTransformationWithMap2() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
                 .select("SIZE(d.contacts)")
@@ -148,9 +144,6 @@ public void testSizeToCountTransformationWithMap2() {
         cb.getResultList();
     }
 
-    // TODO: create datanucleus issue
-    // fails with datanucleus-4
-    @Category(NoDatanucleus4.class)
     @Test
     public void testSizeToCountTransformationWithCollectionBag() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
@@ -160,9 +153,6 @@ public void testSizeToCountTransformationWithCollectionBag() {
         cb.getResultList();
     }
 
-    // TODO: create datanucleus issue
-    // fails with datanucleus-5
-    @Category(NoDatanucleus.class)
     @Test
     public void testSizeToCountTransformationWithListBag() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
@@ -183,9 +173,7 @@ public void testDuplicateSizeExpressionsInSelect() {
         cb.getResultList();
     }
 
-    // NOTE: DataNucleus renders the literal `(1)` for the byte array parameter on PostgreSQL which is wrong
     @Test
-    @Category({ NoDatanucleus.class })
     public void testDisableCountTransformationWhenParameterUsedInSelect() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class).from(Document.class, "d")
                 .select("CASE WHEN d.age > 0 THEN d.byteArray ELSE :byteArray END")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java
index ee4aace095..e7b9929ebf 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java
@@ -5,30 +5,27 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import java.util.List;
 
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlMacro;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
 import com.blazebit.persistence.impl.BuilderChainingException;
+import com.blazebit.persistence.spi.FunctionRenderContext;
+import com.blazebit.persistence.spi.JpqlMacro;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
-import org.junit.experimental.categories.Category;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -327,7 +324,7 @@ public void testSubqueryCorrelatesOverRelation() {
 
     // This test compares ids
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testSubqueryCorrelatesArrayExpression() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d")
                 .whereExists()
@@ -354,8 +351,6 @@ public void testSubqueryCorrelatesArrayExpressionEntityEqual() {
     }
 
     @Test
-    // TODO: Report datanucleus issue
-    @Category({ NoDatanucleus.class })
     public void testMultipleCorrelationsWithJoins() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d")
                 .where("owner").in()
@@ -400,8 +395,6 @@ public void testMultipleCorrelationsWithJoins() {
     }
 
     @Test
-    // TODO: Report datanucleus issue
-    @Category({ NoDatanucleus.class })
     public void testReorderExplicitJoins() {
         CriteriaBuilder<Document> crit = cbf.create(em, Document.class, "d")
             .where("owner").in()
@@ -492,7 +485,9 @@ public void testSubqueryCollectionAccessAddsJoin() {
         crit.getResultList();
     }
 
+    // NOTE: Hibernate ORM doesn't detect that it has to use the join alias column
     @Test
+    @Category({ NoHibernate.class })
     public void testSubqueryUsesOuterJoin() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class)
                 .from(Document.class, "d")
@@ -574,7 +569,7 @@ public void testMultipleJoinPathSubqueryCollectionAccess() {
 
     @Test
     // A special test for Hibernate that needs a different query to be generated to properly work
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testJoinElementCollectionsOnCorrelatedInverseAssociations() {
         CriteriaBuilder<Integer> crit = cbf.create(em, Integer.class)
                 .from(Document.class, "d")
@@ -687,8 +682,6 @@ public void testPaginationWithOuterAttributeInSubquery() {
     }
 
     @Test
-    // NOTE: Datanucleus has a bug here: https://github.com/datanucleus/datanucleus-core/issues/173
-    @Category({ NoDatanucleus.class })
     public void testMultiLevelSubqueryAliasVisibility() {
         final CriteriaBuilder<Long> cb = cbf.create(em, Long.class)
                 .from(Document.class, "d")
@@ -714,8 +707,6 @@ public void testMultiLevelSubqueryAliasVisibility() {
     }
 
     @Test
-    // Test for issue #504
-    @Category({ NoDatanucleus.class })
     public void testMultiLevelSubqueryImplicitAliasCollision() {
         final CriteriaBuilder<Long> cb = cbf.create(em, Long.class)
                 .from(Document.class)
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TablePerClassTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TablePerClassTest.java
index d74a9bfc53..f62dd31c43 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TablePerClassTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TablePerClassTest.java
@@ -13,7 +13,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java
index a8eced4e50..28fc99504a 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java
@@ -5,8 +5,12 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Parent;
 import com.blazebit.persistence.testsuite.entity.Sub1;
@@ -15,12 +19,9 @@
 import com.blazebit.persistence.testsuite.entity.Sub2;
 import com.blazebit.persistence.testsuite.entity.Sub2Sub1;
 import com.blazebit.persistence.testsuite.entity.Sub2Sub2;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -43,8 +44,6 @@ protected Class<?>[] getEntityClasses() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void implicitJoinTreatedRoot() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(Parent.class, "p");
@@ -54,9 +53,8 @@ public void implicitJoinTreatedRoot() {
     }
 
     @Test
-    // NOTE: Datanucleus does not seem to support this kind of model? TODO: report the error
     // NOTE: EclipseLink is just fundamentally broken in this regard...
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void multiTreatWithDiscriminatorColumn() {
         // Given
         Sub1 sub1 = new Sub1();
@@ -78,9 +76,8 @@ public void multiTreatWithDiscriminatorColumn() {
     }
 
     @Test
-    // NOTE: Datanucleus does not seem to support this kind of model? TODO: report the error
     // NOTE: EclipseLink is just fundamentally broken in this regard...
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void treatWithSuperTypeColumnAccess() {
         // Given
         Sub1 sub1 = new Sub1();
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java
index 9575134a1e..7a50a82ee7 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java
@@ -5,16 +5,19 @@
 
 package com.blazebit.persistence.testsuite;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.JoinType;
 import com.blazebit.persistence.parser.expression.SyntaxErrorException;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.entity.*;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import com.blazebit.persistence.testsuite.entity.IntIdEntity;
+import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
+import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub1;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub2;
 
 import static org.junit.Assert.assertEquals;
 
@@ -51,8 +54,6 @@ public void treatOfTreatAsExpressionRootNotAllowed() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void implicitJoinTreatedRoot() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -62,8 +63,6 @@ public void implicitJoinTreatedRoot() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void treatInAggregateHaving() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -78,8 +77,6 @@ public void treatInAggregateHaving() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void treatedRootInCaseWhenCondition() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -91,8 +88,6 @@ public void treatedRootInCaseWhenCondition() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void treatedRootInCaseWhenResult() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -104,10 +99,8 @@ public void treatedRootInCaseWhenResult() {
     }
 
     @Test
-    // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
     // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation"
-    @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void fetchJoinTreatedRoot() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -117,10 +110,8 @@ public void fetchJoinTreatedRoot() {
     }
 
     @Test
-    // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
     // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation"
-    @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void fetchJoinTreatedNode() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -131,8 +122,6 @@ public void fetchJoinTreatedNode() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class })
     public void implicitJoinTreatedRelation() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -142,9 +131,8 @@ public void implicitJoinTreatedRelation() {
     }
 
     @Test
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
     // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation"
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void singleValuedAssociationIdOfTreatedImplicitJoinedRelation() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "relation1");
@@ -154,10 +142,8 @@ public void singleValuedAssociationIdOfTreatedImplicitJoinedRelation() {
     }
 
     @Test
-    // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
     // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation"
-    @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void implicitJoinTreatedRootTreatJoin() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -167,9 +153,6 @@ public void implicitJoinTreatedRootTreatJoin() {
     }
 
     @Test
-    // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT
-    // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class, NoDatanucleus4.class })
     public void joinTreatedRelation() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -181,9 +164,8 @@ public void joinTreatedRelation() {
     }
 
     @Test
-    // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error
     // Eclipselink and Datanucleus do not support root treat joins
-    @Category({ NoDatanucleus.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void joinTreatedRoot() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -194,9 +176,8 @@ public void joinTreatedRoot() {
     }
 
     @Test
-    // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error
     // Eclipselink does not support dereferencing of TREAT join path elements
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void joinTreatedRootEmbeddable() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -207,9 +188,8 @@ public void joinTreatedRootEmbeddable() {
     }
 
     @Test
-    // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error
     // Eclipselink does not support dereferencing of TREAT join path elements
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void selectTreatedRootEmbeddable() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -219,8 +199,7 @@ public void selectTreatedRootEmbeddable() {
     }
 
     @Test
-    // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error
-    @Category({ NoDatanucleus.class, NoHibernate.class })
+    @Category({ NoHibernate.class })
     public void treatJoinTreatedRootRelation() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
@@ -233,8 +212,7 @@ public void treatJoinTreatedRootRelation() {
     }
 
     @Test
-    // NOTE: Datanucleus fails with a NPE
-    @Category({ NoEclipselink.class, NoDatanucleus4.class })
+    @Category({ NoEclipselink.class })
     public void implicitJoinTreatedImplicitCorrelation() {
         CriteriaBuilder<PolymorphicBase> crit = cbf.create(em, PolymorphicBase.class, "p")
                 .whereExists().from(PolymorphicSub1.class, "sub1")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java
index 1d23799eb4..b434b90d5a 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java
@@ -5,8 +5,13 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
@@ -14,12 +19,7 @@
 import com.blazebit.persistence.testsuite.entity.PolymorphicSub1;
 import com.blazebit.persistence.testsuite.entity.PolymorphicSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,8 +28,7 @@
  * @since 1.4.0
  */
 // NOTE: EclipseLink does not support subtype property access which is required here
-// NOTE: Seems Datanucleus fails to properly interpret the entity literal
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class TreatedCorrelatedSubqueryTest extends AbstractCoreTest {
 
     private PolymorphicSub1 root2;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java
index 3622545a51..4afe506fb7 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java
@@ -5,25 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer;
 import com.blazebit.persistence.testsuite.entity.PolymorphicSub1;
 import com.blazebit.persistence.testsuite.entity.PolymorphicSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -31,9 +27,6 @@
  * @author Moritz Becker
  * @since 1.4.0
  */
-// NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-// NOTE: Seems Datanucleus fails to properly interpret the entity literal
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class })
 public class TreatedEntityJoinTest extends AbstractCoreTest {
 
     private PolymorphicSub1 root2;
@@ -116,7 +109,7 @@ public void test2() {
 
     // NOTE: EclipseLink requires a join for "relation1" that it doesn't add...
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void entityJoinTreat() {
         CriteriaBuilder<Integer> criteria = cbf.create(em, Integer.class);
         criteria.from(PolymorphicBase.class, "p");
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TupleTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TupleTest.java
index 4f4dc8d667..eb38901d84 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TupleTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TupleTest.java
@@ -11,8 +11,8 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java
index d61b09222e..aeb1e5cb7e 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java
@@ -5,28 +5,23 @@
 
 package com.blazebit.persistence.testsuite;
 
-import static org.junit.Assert.assertEquals;
-
-import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityId;
+import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import jakarta.persistence.EntityManager;
 
-import javax.persistence.EntityManager;
+import static org.junit.Assert.assertEquals;
 
 /**
  * This kind of mapping is not required to be supported by a JPA implementation.
@@ -55,7 +50,7 @@ protected Class<?>[] getEntityClasses() {
     @Test
     // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062
     // TODO: report that datanucleus doesn't support element collection in an embeddable
-    @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testUpdateWithReturningEmbeddable(){
         final String newEmbeddableTestEntityIdKey = "newKey";
 
@@ -82,7 +77,7 @@ public void work(EntityManager em) {
     @Test
     // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062
     // TODO: report that datanucleus doesn't support element collection in an embeddable
-    @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testUpdateWithReturningExplicitId(){
         final String intIdEntity1Key = "1";
 
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java
index ac50ceac44..28c67a2d70 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java
@@ -5,19 +5,21 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.UpdateCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
@@ -31,14 +33,7 @@
 import com.blazebit.persistence.testsuite.entity.TPCSub1;
 import com.blazebit.persistence.testsuite.entity.TPCSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -157,9 +152,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: H2 and MySQL only support returning generated keys
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testTablePerClassWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -190,9 +184,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: H2 and MySQL only support returning generated keys
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testJoinedWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -223,9 +216,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: H2 and MySQL only support returning generated keys
-    // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoEclipselink.class })
     public void testSingleTableWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -257,7 +249,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -278,7 +270,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -299,7 +291,7 @@ public void work(EntityManager em) {
 
     @Test
     // NOTE: H2 and MySQL only support returning generated keys
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturning() {
         transactional(new TxVoidWork() {
             @Override
@@ -320,7 +312,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -351,7 +343,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -382,7 +374,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTE() {
         transactional(new TxVoidWork() {
             @Override
@@ -417,7 +409,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -450,7 +442,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -483,7 +475,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTESelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -518,7 +510,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testTablePerClassReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -551,7 +543,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testJoinedReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -584,7 +576,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testSingleTableReturningInCTESelectNew() {
         transactional(new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java
index bd55e4c5c2..5b9c73931b 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java
@@ -5,35 +5,30 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.UpdateCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentNodeCTE;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.TreeSet;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -104,9 +99,8 @@ public void work(EntityManager em) {
     }
 
     // NOTE: EclipseLink can update neither d.nameObject.intIdEntity nor d.nameObject.intIdEntity.id so associations in embeddables don't work here
-    // NOTE: DN4 also doesn't seem to support this
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus4.class })
+    @Category({ NoEclipselink.class })
     public void testSetEmbeddable() {
         transactional(new TxVoidWork() {
             @Override
@@ -126,7 +120,7 @@ public void work(EntityManager em) {
 
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testImplicitJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -147,7 +141,7 @@ public void work(EntityManager em) {
 
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testMultipleDeepImplicitJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -176,7 +170,7 @@ public void work(EntityManager em) {
     // Test for issue #1615
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesJoin() {
         transactional(new TxVoidWork() {
             @Override
@@ -245,7 +239,7 @@ public void work(EntityManager em) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningAll() {
         transactional(new TxVoidWork() {
             @Override
@@ -269,7 +263,7 @@ public void work(EntityManager em) {
 
     // NOTE: H2 and MySQL only support returning generated keys
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLast() {
         transactional(new TxVoidWork() {
             @Override
@@ -292,7 +286,7 @@ public void work(EntityManager em) {
     // NOTE: H2 and MySQL only support returning generated keys
     // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class })
     public void testReturningLastWithCte() {
         transactional(new TxVoidWork() {
             @Override
@@ -326,7 +320,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testUpdateReturningSelectOld() {
         transactional(new TxVoidWork() {
             @Override
@@ -361,7 +355,7 @@ public void work(EntityManager em) {
 
     // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class })
     public void testUpdateReturningSelectNew() {
         transactional(new TxVoidWork() {
             @Override
@@ -398,7 +392,7 @@ public void work(EntityManager em) {
     // NOTE: H2 and MySQL only support returning generated keys
     // NOTE: MySQL does not support CTEs
     @Test
-    @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class })
     public void testQueryCaching() {
         TxVoidWork work = new TxVoidWork() {
             @Override
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java
index e8ec09a132..50a0bde8d1 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java
@@ -5,16 +5,25 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.function.Consumer;
+import javax.sql.DataSource;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentNodeCTE;
 import com.blazebit.persistence.testsuite.entity.DocumentType;
@@ -24,25 +33,9 @@
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.PersonCTE;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.function.Consumer;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -121,7 +114,7 @@ public void setUp() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunction() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Long.class, "allowedAge", Collections.singleton(1L));
@@ -141,7 +134,7 @@ public void testValuesEntityFunction() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithEmbeddable() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(NameObject.class, "embeddable", Collections.singleton(new NameObject("abc", "123")));
@@ -164,7 +157,7 @@ public void testValuesEntityFunctionWithEmbeddable() {
 
     @Test
     // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithPluralOnlyEmbeddable() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(NameObjectContainer.class, "embeddable", Collections.singleton(new NameObjectContainer("test", new NameObject("abc", "123"))));
@@ -187,7 +180,7 @@ public void testValuesEntityFunctionWithPluralOnlyEmbeddable() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikeBasic() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "name", "n", Collections.singleton("someName"));
@@ -202,7 +195,7 @@ public void testValuesEntityFunctionLikeBasic() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikeEnum() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "documentType", "t", Collections.singleton(DocumentType.NOVEL));
@@ -217,7 +210,7 @@ public void testValuesEntityFunctionLikeEnum() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikeCalendar() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         Calendar cal = Calendar.getInstance();
@@ -238,7 +231,7 @@ public void testValuesEntityFunctionLikeCalendar() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikeEmbeddable() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "nameObject", "t", Collections.singleton(new NameObject("123", "abc")));
@@ -253,7 +246,7 @@ public void testValuesEntityFunctionLikeEmbeddable() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikeEntity() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "owner", "t", Collections.singleton(new Person(1L)));
@@ -268,7 +261,7 @@ public void testValuesEntityFunctionLikeEntity() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikePluralBasic() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "strings", "t", Collections.singleton("test"));
@@ -284,7 +277,7 @@ public void testValuesEntityFunctionLikePluralBasic() {
 
     @Test
     // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikePluralEmbeddable() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "names", "t", Collections.singleton(new NameObject("123", "abc")));
@@ -299,7 +292,7 @@ public void testValuesEntityFunctionLikePluralEmbeddable() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikePluralEntity() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "partners", "t", Collections.singleton(new Person(1L)));
@@ -314,7 +307,7 @@ public void testValuesEntityFunctionLikePluralEntity() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikePluralIndex() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "INDEX(people)", "t", Collections.singleton(1));
@@ -329,7 +322,7 @@ public void testValuesEntityFunctionLikePluralIndex() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLikePluralKey() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Document.class, "KEY(stringMap)", "t", Collections.singleton("key"));
@@ -344,7 +337,7 @@ public void testValuesEntityFunctionLikePluralKey() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testIdentifiableValuesEntityFunctionGroupBy() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
 
@@ -361,7 +354,7 @@ public void testIdentifiableValuesEntityFunctionGroupBy() {
 
     // Test for #305
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithParameterInSelect() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L));
@@ -384,7 +377,7 @@ public void testValuesEntityFunctionWithParameterInSelect() {
 
     // Test for #305
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithParameterInSelectSubquery() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.from(Document.class, "doc");
@@ -404,7 +397,7 @@ public void testValuesEntityFunctionWithParameterInSelectSubquery() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionParameters() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L));
@@ -429,8 +422,7 @@ public void testValuesEntityFunctionParameters() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionLeftJoin() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L, 3L));
@@ -461,8 +453,7 @@ public void testValuesEntityFunctionLeftJoin() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithEntity() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(IntIdEntity.class, "intEntity", Arrays.asList(
@@ -493,8 +484,7 @@ public void testValuesEntityFunctionWithEntity() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionParameter() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.fromValues(IntIdEntity.class, "intEntity", 1);
@@ -547,8 +537,7 @@ public void testValuesEntityFunctionParameter() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionParameterWithoutNullsFilter() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");
@@ -571,11 +560,7 @@ public void testValuesEntityFunctionParameterWithoutNullsFilter() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
-    // No hibernate for now, see https://hibernate.atlassian.net/browse/HHH-11340
-    // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionInCte() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");
@@ -606,7 +591,7 @@ public void testValuesEntityFunctionInCte() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithCteEntity() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");
@@ -625,7 +610,7 @@ public void testValuesEntityFunctionWithCteEntity() {
     }
 
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testFromValuesWithEmbeddables() {
         final Document doc1 = new Document("doc1");
         doc1.setNameObject(new NameObject("doc1Primary", "doc1Secondary"));
@@ -643,8 +628,7 @@ public void testFromValuesWithEmbeddables() {
     }
 
     @Test
-    // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testValuesEntityFunctionWithCteInCteWithSetOperation() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");
@@ -678,8 +662,7 @@ public void testValuesEntityFunctionWithCteInCteWithSetOperation() {
     }
 
     @Test
-    // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testIdentifiableValuesEntityFunction() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WhereTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WhereTest.java
index 036e51dfac..608147be1e 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WhereTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WhereTest.java
@@ -18,7 +18,7 @@
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 
 /**
  *
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java
index 2d4e6dd04c..b58197076d 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java
@@ -5,18 +5,19 @@
 
 package com.blazebit.persistence.testsuite;
 
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -27,7 +28,6 @@
  * @author Sayra Ranjha
  * @since 1.4.0
  */
-@Category({ NoMySQLOld.class })
 public class WindowFunctionTest extends AbstractCoreTest {
 
     @Override
@@ -158,6 +158,8 @@ public void testBasicAggregatesWithVariousRanges() {
     }
 
     @Test
+    // NOTE: Hibernate ORM bug: https://hibernate.atlassian.net/browse/HHH-18836
+    @Category({ NoMySQL.class })
     public void testWindowBooleanAggregateOverRows() {
         CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
                 .from(Person.class, "per")
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/AbstractTreatVariationsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/AbstractTreatVariationsTest.java
index c37cede356..9177c336fe 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/AbstractTreatVariationsTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/AbstractTreatVariationsTest.java
@@ -33,7 +33,7 @@
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java
index 2043ac4bab..ed227c4fb1 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.treat.builder;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -16,7 +16,7 @@
 
 // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385
 @RunWith(Parameterized.class)
-@Category({ NoHibernate60.class })
+@Category({ NoHibernate62.class })
 public class JoinManyToManyMapValueTest extends AbstractTreatVariationsTest {
 
     public JoinManyToManyMapValueTest(String strategy, String objectPrefix) {
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java
index df29feb71e..1c5f262efa 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.treat.builder;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -16,7 +16,7 @@
 
 // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385
 @RunWith(Parameterized.class)
-@Category({ NoHibernate60.class })
+@Category({ NoHibernate62.class })
 public class JoinOneToManyInverseSetTest extends AbstractTreatVariationsTest {
 
     public JoinOneToManyInverseSetTest(String strategy, String objectPrefix) {
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java
index 660a634813..e1125f68c9 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.testsuite.treat.builder;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -16,7 +16,7 @@
 
 // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385
 @RunWith(Parameterized.class)
-@Category({ NoHibernate60.class })
+@Category({ NoHibernate62.class })
 public class JoinOneToManyListTest extends AbstractTreatVariationsTest {
 
     public JoinOneToManyListTest(String strategy, String objectPrefix) {
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java
index 99f69c8341..2b1e7651ea 100644
--- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java
+++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java
@@ -6,11 +6,19 @@
 
 package com.blazebit.persistence.testsuite.treat.jpql;
 
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
+
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.treat.entity.Base;
 import com.blazebit.persistence.testsuite.treat.entity.BaseEmbeddable;
@@ -28,21 +36,12 @@
 import com.blazebit.persistence.testsuite.treat.entity.TablePerClassSub1;
 import com.blazebit.persistence.testsuite.treat.entity.TablePerClassSub2;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
-
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 // NOTE: These tests are just for reference and have been copied and adapted form the jpa-treat-variations repository
-@Category({ NoHibernate.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoHibernate.class, NoEclipselink.class })
 public abstract class AbstractTreatVariationsTest extends AbstractCoreTest {
     
     protected final String strategy;
diff --git a/creating-a-release.md b/creating-a-release.md
index 783f9fb78f..1c4a7ff966 100644
--- a/creating-a-release.md
+++ b/creating-a-release.md
@@ -17,14 +17,14 @@ A release involves various steps which are outlined here and should be kept up-t
 . Open `website/src/main/jbake/jbake.properties` and update `stable.version` to the latest released version
 . Open `website/pom.xml` and update the property `stable.version` to the latest released version, `snapshot.version` to the latest snapshot version and `series.version` to the current version series
 . Open `documentation/pom.xml` and update the property `stable.version` to the latest released version and `series.version` to the current version series
-. Prepare a local Maven release via `mvnw -P "blazebit-release,h2,hibernate-5.6,deltaspike-1.9,spring-data-2.7.x" release:clean release:prepare "-Darguments=-DskipTests -DskipITs '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot'"`
-. Actually deploy the release with `mvnw -P "blazebit-release,h2,hibernate-5.6,deltaspike-1.9,spring-data-2.7.x" release:perform "-Darguments=-DskipTests -DskipITs '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot' -DretryFailedDeploymentCount=10"`
+. Prepare a local Maven release via `mvnw -P "blazebit-release,h2,hibernate-6.6,deltaspike-2.0,spring-data-3.3.x" release:clean release:prepare "-Darguments=-DskipTests -DskipITs"`
+. Actually deploy the release with `mvnw -P "blazebit-release,h2,hibernate-6.6,deltaspike-2.0,spring-data-3.3.x" release:perform "-Darguments=-DskipTests -DskipITs -DretryFailedDeploymentCount=10"`
 . Goto https://oss.sonatype.org and login. In *Build Promotion* click on *Staging Repositories* then scroll down and find a repository named *comblazebit-...*
 . Click on the repository, then click *Close* and *Confirm*. Wait a few seconds, click *Refresh* and finally click *Release* and *Confirm*
 . Commit the changes and push the branch `git push origin`, as well as the created tag `git push origin TAG`
 . Create a GitHub release from the tag and use the same content as in `website/src/main/jbake/content/news/CURRENT_YEAR/blaze-persistence-VERSION-release.adoc` and add the _tar.gz_ and _zip_ artifacts of `blaze-persistence-distribution` as binaries to the release
-. Push the new website changes only if you are working on the latest version series and first to the staging server by invoking `./build-deploy-website.sh staging '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot'` and if everything is alright push to production with `./build-deploy-website.sh prod '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot'`
-. If you want to push just the documentation changes use `./build-deploy-documentation.sh staging '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot'` and if everything is alright also push to production with `./build-deploy-documentation.sh prod '-Djdk8.home=C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot'`
+. Push the new website changes only if you are working on the latest version series and first to the staging server by invoking `./build-deploy-website.sh staging` and if everything is alright push to production with `./build-deploy-website.sh prod`
+. If you want to push just the documentation changes use `./build-deploy-documentation.sh staging` and if everything is alright also push to production with `./build-deploy-documentation.sh prod`
 . Create tweet about new version
 . Update version in Quarkus ecosystem ci poms
 
@@ -37,7 +37,7 @@ A private release involves the following steps
 . Make sure you have GPG installed and the executable is available on PATH
 . Make sure your Maven settings.xml has credentials for the server `blazebit` configured
 . Make sure your Maven settings.xml has a profile called `blazebit-release` with the property `gpg.passphrase`
-. Make sure you have `C:\Program Files\Java\jdk-14` and `C:\Program Files\Eclipse Adoptium\jdk-8.0.332.9-hotspot` installed or update the `deploy-project-release.bat` script
+. Make sure you have `C:\Program Files\Java\jdk-17` installed or update the `deploy-project-release.bat` script
 . Checkout the commercial branch for the minor version e.g. `1.5-commercial`
 . Invoke `mvn org.codehaus.mojo:versions-maven-plugin:2.1:set "-DnewVersion=1.5.X"`
 . Invoke `deploy-project-release.bat`
diff --git a/deploy-project-release.bat b/deploy-project-release.bat
index 1c259a3e56..5a4c7dcbe1 100644
--- a/deploy-project-release.bat
+++ b/deploy-project-release.bat
@@ -1,6 +1,6 @@
 @echo off
 set default_project_path=%~dp0
-set default_jdk_path=C:\Program Files\Java\jdk-14
+set default_jdk_path=C:\Program Files\Java\jdk-17
 
 set /p project_path="Path to project [%default_project_path%]: "
 
@@ -16,4 +16,4 @@ if "%jdk_path%" == "" (
 set JAVA_HOME=%jdk_path%
 echo "Using JAVA_HOME=%JAVA_HOME%"
 set MAVEN_OPTS="-Xmx1024m"
-./mvnw -P "blazebit-release,h2,hibernate-5.6,deltaspike-1.9,spring-data-2.7.x" -f %project_path%\pom.xml install deploy:deploy -DskipTests -DskipITs "-Djdk8.home=C:\Program Files\Java\jdk1.8.0_181" -DaltDeploymentRepository=blazebit::default::https://nexus.blazebit.com/repository/maven-releases/ %*
+./mvnw -P "blazebit-release,h2,hibernate-6.6,deltaspike-2.0,spring-data-3.3.x" -f %project_path%\pom.xml install deploy:deploy -DskipTests -DskipITs -DaltDeploymentRepository=blazebit::default::https://nexus.blazebit.com/repository/maven-releases/ %*
diff --git a/dist/bom/pom.xml b/dist/bom/pom.xml
index 47531a870d..e045cb97dc 100644
--- a/dist/bom/pom.xml
+++ b/dist/bom/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -42,222 +42,72 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-core-parser</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-core-impl</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-api</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-impl</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-processor</artifactId>
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-jpa-base</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-base-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-eclipselink</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-openjpa</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -265,18 +115,6 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-entity-view-cdi-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
@@ -301,60 +139,6 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
@@ -373,12 +157,6 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-webflux</artifactId>
@@ -391,12 +169,6 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
@@ -411,13 +183,7 @@
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
@@ -451,72 +217,30 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-jaxrs-jsonb-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-jackson</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-jsonb</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql-spqr</artifactId>
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-graphql-spqr-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql-dgs-7.0</artifactId>
@@ -525,13 +249,13 @@
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-quarkus</artifactId>
+                <artifactId>blaze-persistence-integration-quarkus-3</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-quarkus-deployment</artifactId>
+                <artifactId>blaze-persistence-integration-quarkus-3-deployment</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
@@ -541,12 +265,6 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-querydsl-expressions-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/dist/full/pom.xml b/dist/full/pom.xml
deleted file mode 100644
index 7fb68f4de8..0000000000
--- a/dist/full/pom.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-distribution-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-distribution</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Blazebit Persistence Distribution</name>
-
-    <dependencies>
-
-        <!-- Project dependencies -->
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-
-        <!-- Module dependencies -->
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-eclipselink</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-openjpa</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base-3.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base-3.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webflux</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-rest-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-rest-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-spqr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-dgs-7.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-hateoas-webmvc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-quarkus</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-quarkus-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-querydsl-expressions</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/distribution/assembly.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>blaze-persistence-dist-${project.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/dist/full/src/main/distribution/assembly.xml b/dist/full/src/main/distribution/assembly.xml
deleted file mode 100644
index 8ec8b13bb9..0000000000
--- a/dist/full/src/main/distribution/assembly.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-    <formats>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/../..</directory>
-            <includes>
-                <include>README*</include>
-                <include>LICENSE*</include>
-            </includes>
-            <outputDirectory>.</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-common-utils</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/required/blaze-common-utils</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-core-*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/required/core</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-entity-view-*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/entity-view</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-jpa-criteria-*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/jpa-criteria</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-jpa-base</include>
-                <include>com.blazebit:blaze-persistence-integration-jpa-base-jakarta</include>
-                <include>com.blazebit:blaze-persistence-integration-hibernate-*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/hibernate</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-jpa-base</include>
-                <include>com.blazebit:blaze-persistence-integration-datanucleus*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/datanucleus</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-jpa-base</include>
-                <include>com.blazebit:blaze-persistence-integration-eclipselink*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/eclipselink</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-jpa-base</include>
-                <include>com.blazebit:blaze-persistence-integration-openjpa*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/openjpa</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-quarkus</include>
-                <include>com.blazebit:blaze-persistence-integration-quarkus-runtime</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/quarkus</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-querydsl-expressions</include>
-                <include>com.blazebit:blaze-persistence-integration-querydsl-expressions-jakarta</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/querydsl</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.blazebit:blaze-persistence-integration-entity-view-*</include>
-                <include>com.blazebit:blaze-persistence-integration-spring-*</include>
-                <include>com.blazebit:blaze-persistence-integration-deltaspike-data-*</include>
-                <include>com.blazebit:blaze-persistence-integration-jaxrs*</include>
-                <include>com.blazebit:blaze-persistence-integration-jackson*</include>
-                <include>com.blazebit:blaze-persistence-integration-graphql*</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>lib/integration/entity-view</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>
diff --git a/dist/pom.xml b/dist/pom.xml
index cc36aaa126..d442f51f70 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -22,25 +22,4 @@
     <modules>
         <module>bom</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <properties>
-                <!-- We can only release with a JDK 9 since we build MR JARs -->
-                <jdk.min.version>1.9</jdk.min.version>
-            </properties>
-            <modules>
-                <module>bom</module>
-                <module>full</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>dist</id>
-            <modules>
-                <module>bom</module>
-                <module>full</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 27d8a5d176..d87dc34019 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
     <properties>
         <version.asciidoctor>1.6.0-alpha.7</version.asciidoctor>
         <stable.version>1.6.14</stable.version>
-        <series.version>1.6</series.version>
+        <series.version>2.0</series.version>
     </properties>
 
     <build>
diff --git a/documentation/src/main/asciidoc/core/manual/en_US/getting_started.adoc b/documentation/src/main/asciidoc/core/manual/en_US/getting_started.adoc
index e239d741ff..25518680c8 100644
--- a/documentation/src/main/asciidoc/core/manual/en_US/getting_started.adoc
+++ b/documentation/src/main/asciidoc/core/manual/en_US/getting_started.adoc
@@ -56,24 +56,6 @@ The required dependencies for the core module are
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 Depending on the JPA provider that should be used, one of the following integrations is required
 
 [[maven-setup-hibernate62]]
@@ -89,162 +71,6 @@ Depending on the JPA provider that should be used, one of the following integrat
 </dependency>
 ----
 
-[[maven-setup-hibernate56-jakarta]]
-===== Hibernate 5.6+ Jakarta
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate56]]
-===== Hibernate 5.6
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate55-jakarta]]
-===== Hibernate 5.5 Jakarta
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate55]]
-===== Hibernate 5.5
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate54]]
-===== Hibernate 5.4
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate53]]
-===== Hibernate 5.3
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate52]]
-===== Hibernate 5.2
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate5]]
-===== Hibernate 5+
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate43]]
-===== Hibernate 4.3
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-hibernate42]]
-===== Hibernate 4.2
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-datanucleus51]]
-===== Datanucleus 5.1
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-[[maven-setup-datanucleus]]
-===== Datanucleus 4 and 5
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 [[maven-setup-eclipselink]]
 ===== EclipseLink
 
@@ -258,19 +84,6 @@ Depending on the JPA provider that should be used, one of the following integrat
 </dependency>
 ----
 
-[[maven-setup-openjpa]]
-===== OpenJPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-openjpa</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 [[maven-setup-querydsl-integration]]
 ===== Querydsl integration
 
@@ -286,18 +99,6 @@ When you work with Querydsl you can additionally have first class integration by
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-querydsl-expressions-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 [[anchor-environment]]
 === Environments
 
diff --git a/documentation/src/main/asciidoc/core/manual/en_US/querydsl.adoc b/documentation/src/main/asciidoc/core/manual/en_US/querydsl.adoc
index 9988e9971e..7c171253cb 100644
--- a/documentation/src/main/asciidoc/core/manual/en_US/querydsl.adoc
+++ b/documentation/src/main/asciidoc/core/manual/en_US/querydsl.adoc
@@ -31,25 +31,7 @@ As outlined in the <<maven-querydsl-setup,setup section>> you need the following
 </dependency>
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-querydsl-expressions</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
+    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/getting_started.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/getting_started.adoc
index cb96893f94..8cbba0a35f 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/getting_started.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/getting_started.adoc
@@ -48,24 +48,6 @@ The required dependencies for the entity view module are
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 Depending on the environment, there are some integrations that help you with configuration
 
 [[maven-setup-apt]]
@@ -83,18 +65,6 @@ The annotation processor will generate static entity view metamodels, static ent
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>provided</scope>
-</dependency>
-----
-
 [[maven-setup-cdi-integration]]
 ===== CDI integration
 
@@ -108,33 +78,9 @@ or if you are using Jakarta JPA
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 [[maven-setup-spring-integration]]
 ===== Spring integration
 
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
-or if you are using Jakarta APIs and Spring 6+
-
 [source,xml]
 ----
 <dependency>
@@ -154,21 +100,19 @@ When you work with Spring Data you can additionally have first class integration
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
 ----
 
-For Spring-Data version 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0 or 1.x use the artifact with the respective suffix `2.6`, `2.5`, `2.4`, `2.3`, `2.2`, `2.1`, `2.0`, `1.x`.
-
-If you are using Jakarta APIs and Spring Framework 6+ / Spring Boot 3+, use this
+For Spring-Data version 3.2 and 3.1, use this
 
 [source,xml]
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
@@ -195,36 +139,6 @@ NOTE: The Spring Data integration depends on the _jpa-criteria_ module
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-If a JPA provider that does not implement the JPA 2.1 specification like Hibernate 4.2 or OpenJPA is used, the following compatibility dependency is also required.
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 [[maven-setup-spring-hateoas-integration]]
 ===== Spring HATEOAS integration
 
@@ -240,18 +154,6 @@ When you work with Spring HATEOAS you can additionally have first class support
 </dependency>
 ----
 
-or if you are using Jakarta APIs and Spring Framework 6+ / Spring Boot 3+ use
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 More information about the integration can be found in the <<spring-hateoas-integration,Spring HATEOAS chapter>>.
 
 [[quarkus-setup]]
@@ -263,7 +165,7 @@ To use the Quarkus extension you need to add the following Maven dependency to y
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-quarkus</artifactId>
+    <artifactId>blaze-persistence-integration-quarkus-3</artifactId>
     <version>${blaze-persistence.version}</version>
 </dependency>
 ----
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/graphql.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/graphql.adoc
index d6b5d29ca7..198cf9677e 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/graphql.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/graphql.adoc
@@ -22,18 +22,6 @@ To use the GraphQL integration you need the following Maven dependencies:
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 Note that the integration works with the de facto standard runtime for GraphQL which is `graphql-java`. At least version 17.3 is required.
 
 === Usage
@@ -416,17 +404,6 @@ To use the SPQR GraphQL integration you need the following Maven dependencies:
     <scope>compile</scope>
 </dependency>
 ----
-
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-graphql-spqr-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
 ----
 
 The SPQR configuration is very simple and since the framework is fully declarative, you don't need a dedicated GraphQL schema definition.
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/jaxrs.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/jaxrs.adoc
index 28349b0219..b7312bb84f 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/jaxrs.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/jaxrs.adoc
@@ -25,18 +25,6 @@ To use the Jackson integration directly you need the following Maven dependencie
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 To use the JSONB integration directly you need the following Maven dependencies:
 
 [source,xml]
@@ -49,18 +37,6 @@ To use the JSONB integration directly you need the following Maven dependencies:
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jaxrs-jsonb-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
 [[jaxrs-features]]
 === Features
 
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/serialization_support.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/serialization_support.adoc
index 538bcbeb00..c868b57bbb 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/serialization_support.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/serialization_support.adoc
@@ -47,18 +47,6 @@ To use the Jackson integration directly you need the following Maven dependencie
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 If you are using JAX-RS, Spring WebMvc or Spring WebFlux, consider using the already existing integrations instead to avoid unnecessary work.
 
 ==== Usage
@@ -93,18 +81,6 @@ To use the JSONB integration directly you need the following Maven dependencies:
 </dependency>
 ----
 
-or if you are using Jakarta JPA
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 If you are using JAX-RS, Spring WebMvc or Spring WebFlux, consider using the already existing integrations instead to avoid unnecessary work.
 
 ==== Usage
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_data.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_data.adoc
index ffc133cc44..ba401a16af 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_data.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_data.adoc
@@ -16,27 +16,25 @@ In short, the following Maven dependencies are required
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
 ----
 
-For Spring-Data version 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0 or 1.x use the `blaze-persistence-integration-spring-data` artifact with the respective suffix `2.6`, `2.5` `2.4`, `2.3`, `2.2`, `2.1`, `2.0`, `1.x`.
-
-If you are using Jakarta APIs and Spring Framework 6+ / Spring Boot 3+, use this
+For Spring-Data version 3.2 or 3.1, use this
 
 [source,xml]
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
@@ -283,18 +281,6 @@ To setup the project for Spring Data WebMvc you have to add the following additi
 </dependency>
 ----
 
-or if you are using Jakarta APIs and Spring 6+
-
-[source,xml]
-----
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-----
-
 ==== Usage
 
 First, a keyset pagination enabled repository is needed which can be done by using `KeysetAwarePage` as return type.
diff --git a/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_hateoas.adoc b/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_hateoas.adoc
index fc97df6bf1..c63329cded 100644
--- a/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_hateoas.adoc
+++ b/documentation/src/main/asciidoc/entity-view/manual/en_US/spring_hateoas.adoc
@@ -18,24 +18,6 @@ In short, the following Maven dependencies are required
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-----
-
-or if you are using Jakarta APIs and Spring 6+
-
-[source,xml]
-----
-<dependency>
-    <groupId>${project.groupId}</groupId>
-    <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
 <dependency>
     <groupId>com.blazebit</groupId>
     <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
diff --git a/entity-view/api-jakarta/pom.xml b/entity-view/api-jakarta/pom.xml
deleted file mode 100644
index fba3e5d5e6..0000000000
--- a/entity-view/api-jakarta/pom.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-entity-view-api:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-api:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-api:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/api-jar/pom.xml b/entity-view/api-jar/pom.xml
deleted file mode 100644
index d2fbf1352f..0000000000
--- a/entity-view/api-jar/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-api-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-entity-view-api</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-entity-view-api</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/api/pom.xml b/entity-view/api/pom.xml
index ac5bfd006d..a3fbb4af59 100644
--- a/entity-view/api/pom.xml
+++ b/entity-view/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,45 +29,21 @@
             <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
 
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.core;
-                                        exports com.blazebit.persistence.view;
-                                        exports com.blazebit.persistence.view.change;
-                                        exports com.blazebit.persistence.view.filter;
-                                        exports com.blazebit.persistence.view.metamodel;
-                                        exports com.blazebit.persistence.view.spi;
-                                        exports com.blazebit.persistence.view.spi.type;
-                                        uses com.blazebit.persistence.view.spi.EntityViewConfigurationProvider;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/CorrelationBuilder.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/CorrelationBuilder.java
index 8f2855ace6..173d5ee265 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/CorrelationBuilder.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/CorrelationBuilder.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.FromProvider;
 import com.blazebit.persistence.JoinOnBuilder;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  * A builder for correlating a basis with an entity class.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/EntityViewManager.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/EntityViewManager.java
index 8edba18f16..38cf3bfcd8 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/EntityViewManager.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/EntityViewManager.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.view.change.SingularChangeModel;
 import com.blazebit.persistence.view.metamodel.ViewMetamodel;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Map;
 
 /**
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/LockMode.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/LockMode.java
index 037d27410d..707d6593bc 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/LockMode.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/LockMode.java
@@ -22,12 +22,12 @@ public enum LockMode {
      */
     OPTIMISTIC,
     /**
-     * The pessimistic read locking mode will acquire a {@link javax.persistence.LockModeType#PESSIMISTIC_READ} for the entity when reading the entity view.
+     * The pessimistic read locking mode will acquire a {@link jakarta.persistence.LockModeType#PESSIMISTIC_READ} for the entity when reading the entity view.
      * This lock mode is only useful within the bounds of a single transaction as the lock is bound to it.
      */
     PESSIMISTIC_READ,
     /**
-     * The pessimistic write locking mode will acquire a {@link javax.persistence.LockModeType#PESSIMISTIC_WRITE} for the entity when reading the entity view.
+     * The pessimistic write locking mode will acquire a {@link jakarta.persistence.LockModeType#PESSIMISTIC_WRITE} for the entity when reading the entity view.
      * This lock mode is only useful within the bounds of a single transaction as the lock is bound to it.
      */
     PESSIMISTIC_WRITE,
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/MappingInverse.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/MappingInverse.java
index fa5d2b0609..e3869eaa11 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/MappingInverse.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/MappingInverse.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/OptimisticLockException.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/OptimisticLockException.java
index ecf53cab6b..d5da6fed20 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/OptimisticLockException.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/OptimisticLockException.java
@@ -11,7 +11,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-public class OptimisticLockException extends javax.persistence.OptimisticLockException {
+public class OptimisticLockException extends jakarta.persistence.OptimisticLockException {
 
     /**
      * The entity view object that caused the exception.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommit.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommit.java
index d55018c6ec..f39e5988e3 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommit.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommit.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommitListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommitListener.java
index 71b83bf7f0..56177d0404 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommitListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostCommitListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after committing a flush for an entity view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersist.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersist.java
index bfee40aae0..46d51329e8 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersist.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersist.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistEntityListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistEntityListener.java
index 3b2bc52010..1960aa3d03 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistEntityListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistEntityListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after persisting a creatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistListener.java
index 271fb74b09..5b57cc4ed0 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostPersistListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after persisting a creatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemove.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemove.java
index c9d147970d..29fbaf6b7a 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemove.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemove.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemoveListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemoveListener.java
index f054e45a7a..7095b2076a 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemoveListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRemoveListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after a view is removed.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollback.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollback.java
index 84b26deb70..09478c786e 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollback.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollback.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollbackListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollbackListener.java
index 5c28186c5a..496e3b7738 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollbackListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostRollbackListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after rolling back a flush for an entity view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdate.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdate.java
index 9c66d13d0f..734df978f5 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdate.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdate.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdateListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdateListener.java
index 78741e4944..0ae1552e31 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdateListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PostUpdateListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback after updating an updatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersist.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersist.java
index c1a63db93b..8b2168c3e3 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersist.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersist.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation to mark a method to be executed before a call to {@link javax.persistence.EntityManager#persist(Object)} when flushing
+ * Annotation to mark a method to be executed before a call to {@link jakarta.persistence.EntityManager#persist(Object)} when flushing
  * the creatable entity view containing this method via {@link EntityViewManager#save(EntityManager, Object)}.
  * A method annotated with <code>@PrePersist</code> may optionally have the following parameters
  * <ul>
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistEntityListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistEntityListener.java
index f0db51b858..d5544ff23b 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistEntityListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistEntityListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback before persisting a creatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistListener.java
index bad316cd72..95173a9023 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PrePersistListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback before persisting a creatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemove.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemove.java
index 7c97fdbdff..f1fac8e78e 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemove.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemove.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemoveListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemoveListener.java
index 51ec41a34e..0a7b28922a 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemoveListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreRemoveListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback before a view is removed.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdate.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdate.java
index 28f37dc7a4..06ec7cb19d 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdate.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdate.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdateListener.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdateListener.java
index 407e4a6293..9ebb2aea55 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdateListener.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/PreUpdateListener.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A listener for getting a callback before updating an updatable view.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/SerializableEntityViewManager.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/SerializableEntityViewManager.java
index 117730105a..ddb9d5934e 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/SerializableEntityViewManager.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/SerializableEntityViewManager.java
@@ -10,9 +10,8 @@
 import com.blazebit.persistence.view.change.SingularChangeModel;
 import com.blazebit.persistence.view.metamodel.ViewMetamodel;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.io.Serializable;
-import java.lang.reflect.Field;
 import java.util.Map;
 
 /**
@@ -25,10 +24,8 @@ public class SerializableEntityViewManager implements EntityViewManager, Seriali
 
     public static final String EVM_FIELD_NAME = "ENTITY_VIEW_MANAGER";
     public static final String SERIALIZABLE_EVM_FIELD_NAME = "SERIALIZABLE_ENTITY_VIEW_MANAGER";
-    public static final String SERIALIZABLE_EVM_DELEGATE_FIELD_NAME = "evm";
 
     private final Class<?> entityViewClass;
-    private transient volatile EntityViewManager evm;
 
     /**
      * Creates a new serializable entity view manager.
@@ -38,20 +35,14 @@ public class SerializableEntityViewManager implements EntityViewManager, Seriali
      */
     public SerializableEntityViewManager(Class<?> entityViewClass, EntityViewManager evm) {
         this.entityViewClass = entityViewClass;
-        this.evm = evm;
     }
 
     private EntityViewManager getEvm() {
-        EntityViewManager evm = this.evm;
-        if (evm == null) {
-            try {
-                Field field = entityViewClass.getDeclaredField(EVM_FIELD_NAME);
-                this.evm = evm = (EntityViewManager) field.get(null);
-            } catch (Exception ex) {
-                throw new IllegalStateException("Could not access entity view manager of entity view class: " + entityViewClass.getName(), ex);
-            }
+        try {
+            return (EntityViewManager) entityViewClass.getDeclaredField(EVM_FIELD_NAME).get(null);
+        } catch (Exception ex) {
+            throw new IllegalStateException("Could not access entity view manager of entity view class: " + entityViewClass.getName(), ex);
         }
-        return evm;
     }
 
     @Override
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/metamodel/ViewRoot.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/metamodel/ViewRoot.java
index e641489b02..c714f94d20 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/metamodel/ViewRoot.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/metamodel/ViewRoot.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.CorrelationProvider;
 import com.blazebit.persistence.view.CorrelationProviderFactory;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 import java.util.List;
 
 /**
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewConfiguration.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewConfiguration.java
index 79e81220fd..f572e99fe9 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewConfiguration.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewConfiguration.java
@@ -10,7 +10,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.view.EntityViewManager;
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewMapping.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewMapping.java
index e94d4ff0a4..9317676238 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewMapping.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/EntityViewMapping.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.LockMode;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 import java.util.Map;
 
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccess.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccess.java
index 174c4cb8ea..dce20bdf0b 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccess.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccess.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view.spi;
 
-import javax.transaction.Synchronization;
+import jakarta.transaction.Synchronization;
 
 /**
  * A transaction control abstraction that allows to be independent of the concrete transaction technology.
diff --git a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccessFactory.java b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccessFactory.java
index edafbc3fbe..1bbd718a5f 100644
--- a/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccessFactory.java
+++ b/entity-view/api/src/main/java/com/blazebit/persistence/view/spi/TransactionAccessFactory.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view.spi;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A factory for creating a {@link TransactionAccess}.
diff --git a/entity-view/api/src/main/java/module-info.java b/entity-view/api/src/main/java/module-info.java
new file mode 100644
index 0000000000..9ae1ff86cf
--- /dev/null
+++ b/entity-view/api/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.view {
+	requires transitive com.blazebit.persistence.core;
+	requires jakarta.transaction;
+	exports com.blazebit.persistence.view;
+	exports com.blazebit.persistence.view.change;
+	exports com.blazebit.persistence.view.filter;
+	exports com.blazebit.persistence.view.metamodel;
+	exports com.blazebit.persistence.view.spi;
+	exports com.blazebit.persistence.view.spi.type;
+	uses com.blazebit.persistence.view.spi.EntityViewConfigurationProvider;
+}
\ No newline at end of file
diff --git a/entity-view/impl-jakarta/pom.xml b/entity-view/impl-jakarta/pom.xml
deleted file mode 100644
index 8b1add803d..0000000000
--- a/entity-view/impl-jakarta/pom.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${version.javassist}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-entity-view-impl:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-impl:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-impl:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/impl-jar/pom.xml b/entity-view/impl-jar/pom.xml
deleted file mode 100644
index ecee97e61a..0000000000
--- a/entity-view/impl-jar/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-impl-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jar</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${version.javassist}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-entity-view-impl</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/impl/pom.xml b/entity-view/impl/pom.xml
index 70641c0461..53f94fdbc9 100644
--- a/entity-view/impl/pom.xml
+++ b/entity-view/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,8 +21,6 @@
 
     <properties>
         <module.name>com.blazebit.persistence.view.impl</module.name>
-        <jdkSpecificSourceDirectory>src/main/java8</jdkSpecificSourceDirectory>
-        <bootclasspath />
     </properties>
 
     <dependencies>
@@ -53,17 +51,19 @@
             <artifactId>javassist</artifactId>
             <version>${version.javassist}</version>
         </dependency>
-        
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -78,398 +78,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${jdkSpecificSourceDirectory}</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.naming;
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires javassist;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.core.parser;
-                                        requires com.blazebit.persistence.view;
-                                        exports com.blazebit.persistence.view.impl;
-                                        exports com.blazebit.persistence.view.impl.accessor;
-                                        exports com.blazebit.persistence.view.impl.change;
-                                        exports com.blazebit.persistence.view.impl.collection;
-                                        exports com.blazebit.persistence.view.impl.entity;
-                                        exports com.blazebit.persistence.view.impl.filter;
-                                        exports com.blazebit.persistence.view.impl.macro;
-                                        exports com.blazebit.persistence.view.impl.mapper;
-                                        exports com.blazebit.persistence.view.impl.metamodel;
-                                        exports com.blazebit.persistence.view.impl.metamodel.analysis;
-                                        exports com.blazebit.persistence.view.impl.metamodel.attribute;
-                                        exports com.blazebit.persistence.view.impl.objectbuilder;
-                                        exports com.blazebit.persistence.view.impl.objectbuilder.mapper;
-                                        exports com.blazebit.persistence.view.impl.objectbuilder.transformator;
-                                        exports com.blazebit.persistence.view.impl.objectbuilder.transformer;
-                                        exports com.blazebit.persistence.view.impl.objectbuilder.transformer.correlation;
-                                        exports com.blazebit.persistence.view.impl.proxy;
-                                        exports com.blazebit.persistence.view.impl.tx;
-                                        exports com.blazebit.persistence.view.impl.type;
-                                        exports com.blazebit.persistence.view.impl.update;
-                                        exports com.blazebit.persistence.view.impl.update.flush;
-                                        exports com.blazebit.persistence.view.impl.update.listener;
-                                        provides com.blazebit.persistence.view.spi.EntityViewConfigurationProvider with com.blazebit.persistence.view.impl.EntityViewConfigurationProviderImpl;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
-    <profiles>
-        <!--
-        JDK11+, jdk8.home is given and the build doesn't try to compile with a newer java version,
-        so set the bootclasspath which we will use in the multi-release-jar profile below
-        -->
-        <profile>
-            <id>post-10-unsafe-code-non-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar</exists>
-                </file>
-                <property>
-                    <name>!main.java.version</name>
-                </property>
-            </activation>
-            <properties>
-                <bootclasspath>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar</bootclasspath>
-            </properties>
-        </profile>
-        <profile>
-            <id>post-10-unsafe-code-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}classes.jar</exists>
-                </file>
-                <property>
-                    <name>!main.java.version</name>
-                </property>
-            </activation>
-            <properties>
-                <bootclasspath>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}classes.jar</bootclasspath>
-            </properties>
-        </profile>
-        <!-- JDK11+ and jdk8.home is not given, so don't compile the Java 8 sources -->
-        <profile>
-            <id>post-10-unsafe-code-non-mr-jar-non-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <os>
-                    <family>!mac</family>
-                </os>
-                <file>
-                    <missing>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar</missing>
-                </file>
-            </activation>
-            <properties>
-                <jdkSpecificSourceDirectory>src/main/java9</jdkSpecificSourceDirectory>
-            </properties>
-        </profile>
-        <profile>
-            <id>post-10-unsafe-code-non-mr-jar-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <os>
-                    <family>mac</family>
-                </os>
-                <file>
-                    <missing>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}classes.jar</missing>
-                </file>
-            </activation>
-            <properties>
-                <jdkSpecificSourceDirectory>src/main/java9</jdkSpecificSourceDirectory>
-            </properties>
-        </profile>
-        <!-- the build tries to compile with a newer java version, so don't compile the Java 8 sources -->
-        <profile>
-            <id>post-10-unsafe-code-explicit-java-version</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <property>
-                    <name>main.java.version</name>
-                </property>
-            </activation>
-            <properties>
-                <jdkSpecificSourceDirectory>src/main/java9</jdkSpecificSourceDirectory>
-            </properties>
-        </profile>
-        <!--
-        We have a bootclasspath JAR and the build doesn't try to compile with a newer java version,
-        so do the necessary steps to build an MR-Jar
-        -->
-        <profile>
-            <id>multi-release-jar-non-mac</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-                <os>
-                    <family>!mac</family>
-                </os>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar</exists>
-                </file>
-                <property>
-                    <name>!main.java.version</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-compile</id>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <fork>true</fork>
-                                    <!-- When we use a Java 11+ JVM, we need a JDK 8, otherwise we can't compile the old unsafe code -->
-                                    <compilerArguments>
-                                        <bootclasspath>${bootclasspath}</bootclasspath>
-                                    </compilerArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-java9</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>compile-java9-only</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <copy todir="${project.build.directory}/classes9">
-                                            <fileset dir="${project.build.outputDirectory}" excludes="META-INF/versions/**,**/UnsafeHelper.class" />
-                                        </copy>
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.directory}/classes9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Multi-Release>true</Multi-Release>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>java-9-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>9</classifier>
-                                    <classesDirectory>${project.build.directory}/classes9</classesDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>multi-release-jar-mac</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-                <os>
-                    <family>mac</family>
-                </os>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}classes.jar</exists>
-                </file>
-                <property>
-                    <name>!main.java.version</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-compile</id>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <fork>true</fork>
-                                    <!-- When we use a Java 11+ JVM, we need a JDK 8, otherwise we can't compile the old unsafe code -->
-                                    <compilerArguments>
-                                        <bootclasspath>${bootclasspath}</bootclasspath>
-                                    </compilerArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-java9</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>compile-java9-only</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
-                                        <copy todir="${project.build.directory}/classes9">
-                                            <fileset dir="${project.build.outputDirectory}" excludes="META-INF/versions/**,**/UnsafeHelper.class" />
-                                        </copy>
-                                        <javac srcdir="${project.basedir}/src/main/java9" destdir="${project.build.directory}/classes9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Multi-Release>true</Multi-Release>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>java-9-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>9</classifier>
-                                    <classesDirectory>${project.build.directory}/classes9</classesDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/CollectionJoinMappingGathererExpressionVisitor.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/CollectionJoinMappingGathererExpressionVisitor.java
index 4ced46eaa1..c624fc2424 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/CollectionJoinMappingGathererExpressionVisitor.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/CollectionJoinMappingGathererExpressionVisitor.java
@@ -18,9 +18,9 @@
 import com.blazebit.persistence.parser.util.ExpressionUtils;
 import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationImpl.java
index e1d77ef546..6078e42f57 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationImpl.java
@@ -19,7 +19,7 @@
 import com.blazebit.persistence.view.spi.EntityViewMapping;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationProviderImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationProviderImpl.java
index fb17b0de1a..1142a2a886 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationProviderImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewConfigurationProviderImpl.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.impl;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.spi.EntityViewConfigurationProvider;
 
@@ -14,7 +13,6 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-@ServiceProvider(EntityViewConfigurationProvider.class)
 public class EntityViewConfigurationProviderImpl implements EntityViewConfigurationProvider {
 
     @Override
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewManagerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewManagerImpl.java
index b90dca614c..cf45062a40 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewManagerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/EntityViewManagerImpl.java
@@ -131,10 +131,10 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.EntityManager;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Metamodel;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Constructor;
@@ -788,7 +788,7 @@ public <T> T find(EntityManager entityManager, Class<T> entityViewClass, Object
     public <T> T find(EntityManager entityManager, EntityViewSetting<T, CriteriaBuilder<T>> entityViewSetting, Object entityId) {
         ViewTypeImpl<T> managedViewType = metamodel.viewOrError(entityViewSetting.getEntityViewClass());
         EntityType<?> entityType = (EntityType<?>) managedViewType.getJpaManagedType();
-        javax.persistence.metamodel.SingularAttribute<?, ?> idAttribute = JpaMetamodelUtils.getSingleIdAttribute(entityType);
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> idAttribute = JpaMetamodelUtils.getSingleIdAttribute(entityType);
         CriteriaBuilder<?> cb = cbf.create(entityManager, managedViewType.getEntityClass())
                 .where(idAttribute.getName()).eq(entityId);
         List<T> resultList = applySetting(entityViewSetting, cb).getResultList();
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/ScalarTargetResolvingExpressionVisitor.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/ScalarTargetResolvingExpressionVisitor.java
index 800cfcbe6f..72b1c00798 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/ScalarTargetResolvingExpressionVisitor.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/ScalarTargetResolvingExpressionVisitor.java
@@ -52,12 +52,12 @@
 import com.blazebit.persistence.parser.predicate.Predicate;
 import com.blazebit.persistence.spi.JpqlFunction;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Clob;
@@ -110,15 +110,15 @@ public class ScalarTargetResolvingExpressionVisitor extends PathTargetResolvingE
     private final Map<String, JpqlFunction> functions;
     private boolean parametersAllowed;
 
-    public ScalarTargetResolvingExpressionVisitor(Class<?> managedType, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, javax.persistence.metamodel.Type<?>> rootTypes) {
+    public ScalarTargetResolvingExpressionVisitor(Class<?> managedType, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes) {
         this(metamodel.managedType(managedType), metamodel, functions, rootTypes);
     }
 
-    public ScalarTargetResolvingExpressionVisitor(ManagedType<?> managedType, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, javax.persistence.metamodel.Type<?>> rootTypes) {
+    public ScalarTargetResolvingExpressionVisitor(ManagedType<?> managedType, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes) {
         this(managedType, null, metamodel, functions, rootTypes);
     }
 
-    public ScalarTargetResolvingExpressionVisitor(ManagedType<?> managedType, Attribute<?, ?> rootAttribute, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, javax.persistence.metamodel.Type<?>> rootTypes) {
+    public ScalarTargetResolvingExpressionVisitor(ManagedType<?> managedType, Attribute<?, ?> rootAttribute, EntityMetamodel metamodel, Map<String, JpqlFunction> functions, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes) {
         super(metamodel, managedType, rootAttribute, null, rootTypes);
         this.managedType = managedType;
         this.functions = functions;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/SimpleParameterHolder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/SimpleParameterHolder.java
index b72f75f679..f445cd5297 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/SimpleParameterHolder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/SimpleParameterHolder.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.ParameterHolder;
 
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.ParameterExpression;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/TypeExtractingCorrelationBuilder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/TypeExtractingCorrelationBuilder.java
index 94daf333fd..c434c6899c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/TypeExtractingCorrelationBuilder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/TypeExtractingCorrelationBuilder.java
@@ -16,9 +16,9 @@
 import com.blazebit.persistence.view.CorrelationProviderFactory;
 import com.blazebit.persistence.view.impl.metamodel.MetamodelBuildingContext;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/UpdatableExpressionVisitor.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/UpdatableExpressionVisitor.java
index 3ad5347900..2b0ea86d88 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/UpdatableExpressionVisitor.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/UpdatableExpressionVisitor.java
@@ -47,8 +47,8 @@
 import com.blazebit.persistence.parser.predicate.LtPredicate;
 import com.blazebit.persistence.parser.predicate.MemberOfPredicate;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/accessor/Accessors.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/accessor/Accessors.java
index b2db042acd..864a18d565 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/accessor/Accessors.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/accessor/Accessors.java
@@ -19,8 +19,8 @@
 import com.blazebit.persistence.view.metamodel.ViewType;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
@@ -244,7 +244,7 @@ public static AttributeAccessor forEntityMapping(EntityViewManagerImpl evm, Clas
         List<AttributeAccessor> mappers = new ArrayList<>(attributes.size());
         Class<?> targetClass = entityClass;
         for (int i = 0; i < attributes.size() - 1; i++) {
-            javax.persistence.metamodel.Attribute<?, ?> attribute = attributes.get(i);
+            jakarta.persistence.metamodel.Attribute<?, ?> attribute = attributes.get(i);
             Class<?> attributeClass = JpaMetamodelUtils.resolveFieldClass(targetClass, attribute);
             mappers.add(forEntityAttribute(evm, targetClass, attribute, attributeClass));
             targetClass = attributeClass;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractEntityLoader.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractEntityLoader.java
index 5ee6ef4352..7346552b6e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractEntityLoader.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractEntityLoader.java
@@ -15,8 +15,8 @@
 import com.blazebit.persistence.view.metamodel.MappingAttribute;
 import com.blazebit.persistence.view.metamodel.ViewType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -64,14 +64,14 @@ public AbstractEntityLoader(EntityViewManagerImpl evm, Class<?> entityClass, Sin
         }
     }
 
-    protected static javax.persistence.metamodel.SingularAttribute<?, ?> jpaIdOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType) {
+    protected static jakarta.persistence.metamodel.SingularAttribute<?, ?> jpaIdOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType) {
         if (subviewType instanceof ViewType<?>) {
             return JpaMetamodelUtils.getSingleIdAttribute(evm.getMetamodel().getEntityMetamodel().entity(subviewType.getEntityClass()));
         }
         return null;
     }
 
-    protected static javax.persistence.metamodel.SingularAttribute<?, ?> viewIdMappingOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType) {
+    protected static jakarta.persistence.metamodel.SingularAttribute<?, ?> viewIdMappingOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType) {
         if (subviewType instanceof ViewType<?>) {
             ExtendedManagedType<?> managedType = evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, subviewType.getEntityClass());
             return (SingularAttribute<?, ?>) managedType.getAttributes().get(((MappingAttribute) ((ViewType<?>) subviewType).getIdAttribute()).getMapping()).getAttribute();
@@ -79,7 +79,7 @@ public AbstractEntityLoader(EntityViewManagerImpl evm, Class<?> entityClass, Sin
         return null;
     }
 
-    protected static javax.persistence.metamodel.SingularAttribute<?, ?> associationIdMappingOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType, String attributeIdAttributeName) {
+    protected static jakarta.persistence.metamodel.SingularAttribute<?, ?> associationIdMappingOf(EntityViewManagerImpl evm, ManagedViewType<?> subviewType, String attributeIdAttributeName) {
         if (subviewType instanceof ViewType<?>) {
             ExtendedManagedType<?> managedType = evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, subviewType.getEntityClass());
             return (SingularAttribute<?, ?>) managedType.getAttributes().get(attributeIdAttributeName).getAttribute();
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractViewToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractViewToEntityMapper.java
index 68643bc455..3a1218facf 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractViewToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/AbstractViewToEntityMapper.java
@@ -17,8 +17,8 @@
 import com.blazebit.persistence.view.metamodel.Type;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/DefaultEntityLoaderFetchGraphNode.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/DefaultEntityLoaderFetchGraphNode.java
index 76cf767996..2ee8367d0f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/DefaultEntityLoaderFetchGraphNode.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/DefaultEntityLoaderFetchGraphNode.java
@@ -12,9 +12,9 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.flush.FetchGraphNode;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/EntityLoaders.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/EntityLoaders.java
index 88d01ea564..853a45946d 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/EntityLoaders.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/EntityLoaders.java
@@ -15,8 +15,8 @@
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
 import com.blazebit.persistence.view.metamodel.ViewType;
 
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FlusherBasedEntityLoader.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FlusherBasedEntityLoader.java
index f34233720a..cd4d094933 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FlusherBasedEntityLoader.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FlusherBasedEntityLoader.java
@@ -10,9 +10,9 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FullEntityLoader.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FullEntityLoader.java
index ca84553850..ba60ef491a 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FullEntityLoader.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/FullEntityLoader.java
@@ -18,9 +18,9 @@
 import com.blazebit.persistence.view.metamodel.PluralAttribute;
 import com.blazebit.persistence.view.metamodel.SingularAttribute;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseElementToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseElementToEntityMapper.java
index abd1a90016..4d00c81c2c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseElementToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseElementToEntityMapper.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseEntityToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseEntityToEntityMapper.java
index 03fce3d907..3b37a16a5c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseEntityToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseEntityToEntityMapper.java
@@ -12,8 +12,8 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseViewToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseViewToEntityMapper.java
index 0f1cb77488..52c24a2bf5 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseViewToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/InverseViewToEntityMapper.java
@@ -17,8 +17,8 @@
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 import com.blazebit.persistence.view.metamodel.ViewType;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Map;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/LoadOnlyViewToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/LoadOnlyViewToEntityMapper.java
index 4d6c978ecf..ff5862a028 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/LoadOnlyViewToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/LoadOnlyViewToEntityMapper.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 import com.blazebit.persistence.view.impl.update.flush.FetchGraphNode;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/ReferenceEntityLoader.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/ReferenceEntityLoader.java
index 528e21b335..9cea44613f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/ReferenceEntityLoader.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/ReferenceEntityLoader.java
@@ -11,9 +11,9 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/TargetViewClassBasedInverseViewToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/TargetViewClassBasedInverseViewToEntityMapper.java
index 0195f5745e..02800b4701 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/TargetViewClassBasedInverseViewToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/TargetViewClassBasedInverseViewToEntityMapper.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Map;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/UpdaterBasedViewToEntityMapper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/UpdaterBasedViewToEntityMapper.java
index c88e6c18a5..851f1f0bee 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/UpdaterBasedViewToEntityMapper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/entity/UpdaterBasedViewToEntityMapper.java
@@ -15,7 +15,7 @@
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 import com.blazebit.persistence.view.metamodel.Type;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Map;
 import java.util.Set;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/macro/CorrelatedSubqueryViewRootJpqlMacro.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/macro/CorrelatedSubqueryViewRootJpqlMacro.java
index 565d3e8068..7440e10aed 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/macro/CorrelatedSubqueryViewRootJpqlMacro.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/macro/CorrelatedSubqueryViewRootJpqlMacro.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.spi.FunctionRenderContext;
 import com.blazebit.persistence.view.spi.ViewRootJpqlMacro;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java
index 41b3c8fae7..2015c0530c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractAttribute.java
@@ -77,9 +77,9 @@
 import com.blazebit.persistence.view.metamodel.ViewType;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -136,7 +136,7 @@ public abstract class AbstractAttribute<X, Y> implements Attribute<X, Y> {
     protected final MappingType mappingType;
     protected final boolean id;
     protected final boolean isAggregate;
-    protected final javax.persistence.metamodel.Attribute<?, ?> updateMappableAttribute;
+    protected final jakarta.persistence.metamodel.Attribute<?, ?> updateMappableAttribute;
     private final List<TargetType> possibleTargetTypes;
     private final List<TargetType> possibleIndexTargetTypes;
 
@@ -197,7 +197,7 @@ public AbstractAttribute(ManagedViewTypeImplementor<X> declaringType, AttributeM
         SubqueryProviderFactory subqueryProviderFactory = null;
         Class<? extends SubqueryProvider> subqueryProvider = null;
         boolean id = false;
-        javax.persistence.metamodel.Attribute<?, ?> updateMappableAttribute = null;
+        jakarta.persistence.metamodel.Attribute<?, ?> updateMappableAttribute = null;
         String subqueryExpression = null;
         Expression subqueryResultExpression = null;
         String subqueryAlias = null;
@@ -362,7 +362,7 @@ public AbstractAttribute(ManagedViewTypeImplementor<X> declaringType, AttributeM
             }
             correlationProviderFactory = CorrelationProviderHelper.getFactory(correlationProvider);
             ScalarTargetResolvingExpressionVisitor resolver = new ScalarTargetResolvingExpressionVisitor(declaringType.getJpaManagedType(), context.getEntityMetamodel(), context.getJpqlFunctions(), declaringType.getEntityViewRootTypes());
-            javax.persistence.metamodel.Type<?> type = TypeExtractingCorrelationBuilder.extractType(correlationProviderFactory, "_alias", context, resolver);
+            jakarta.persistence.metamodel.Type<?> type = TypeExtractingCorrelationBuilder.extractType(correlationProviderFactory, "_alias", context, resolver);
             correlated = type == null ? null : type.getJavaType();
         } else if (mappingAnnotation instanceof MappingCorrelatedSimple) {
             MappingCorrelatedSimple mappingCorrelated = (MappingCorrelatedSimple) mappingAnnotation;
@@ -489,12 +489,12 @@ private static Class<?> getConvertedType(Class<?> declaringClass, java.lang.refl
         return ReflectionUtils.resolveType(declaringClass, convertedType);
     }
 
-    private javax.persistence.metamodel.Attribute<?, ?> getUpdateMappableAttribute(MetamodelBuildingContext context, Expression mappingExpression) {
+    private jakarta.persistence.metamodel.Attribute<?, ?> getUpdateMappableAttribute(MetamodelBuildingContext context, Expression mappingExpression) {
         if (mappingExpression != null) {
             try {
                 UpdatableExpressionVisitor visitor = new UpdatableExpressionVisitor(context.getEntityMetamodel(), declaringType.getEntityClass(), true, declaringType.getEntityViewRootTypes());
                 mappingExpression.accept(visitor);
-                Iterator<javax.persistence.metamodel.Attribute<?, ?>> iterator = visitor.getPossibleTargets().keySet().iterator();
+                Iterator<jakarta.persistence.metamodel.Attribute<?, ?>> iterator = visitor.getPossibleTargets().keySet().iterator();
                 if (iterator.hasNext()) {
                     return iterator.next();
                 }
@@ -652,9 +652,9 @@ protected boolean determineForcedUnique(MetamodelBuildingContext context) {
         if (isCollection() && getMapping() != null && getMapping().indexOf('.') == -1 && getMappingIndexExpression() == null && getKeyMappingExpression() == null) {
             ExtendedManagedType<?> managedType = context.getEntityMetamodel().getManagedType(ExtendedManagedType.class, getDeclaringType().getJpaManagedType());
             ExtendedAttribute<?, ?> attribute = managedType.getOwnedAttributes().get(getMapping());
-            if (attribute != null && attribute.getAttribute() instanceof javax.persistence.metamodel.PluralAttribute<?, ?, ?>) {
+            if (attribute != null && attribute.getAttribute() instanceof jakarta.persistence.metamodel.PluralAttribute<?, ?, ?>) {
                 // TODO: we should add that information to ExtendedAttribute
-                return (((javax.persistence.metamodel.PluralAttribute<?, ?, ?>) attribute.getAttribute()).getCollectionType() != javax.persistence.metamodel.PluralAttribute.CollectionType.MAP)
+                return (((jakarta.persistence.metamodel.PluralAttribute<?, ?, ?>) attribute.getAttribute()).getCollectionType() != jakarta.persistence.metamodel.PluralAttribute.CollectionType.MAP)
                         && (!StringUtils.isEmpty(attribute.getMappedBy()) || !attribute.isBag())
                         && (attribute.getJoinTable() == null || attribute.getJoinTable().getKeyColumnMappings() == null)
                         && !MetamodelUtils.isIndexedList(context.getEntityMetamodel(), managedType.getType().getJavaType(), mappingExpression, mapping);
@@ -664,7 +664,7 @@ protected boolean determineForcedUnique(MetamodelBuildingContext context) {
         return false;
     }
 
-    public javax.persistence.metamodel.Attribute<?, ?> getUpdateMappableAttribute() {
+    public jakarta.persistence.metamodel.Attribute<?, ?> getUpdateMappableAttribute() {
         return updateMappableAttribute;
     }
 
@@ -777,7 +777,7 @@ private static Class<?> getElementTypeOrNull(TargetType t, boolean singular) {
      * @param singular Whether the view attribute is singular
      * @return True if mapping from <code>entityAttributeType</code>/<code>entityAttributeElementType</code> to <code>targetType</code>/<code>viewAttributeElementType</code> is possible
      */
-    private static boolean isCompatible(javax.persistence.metamodel.Attribute<?, ?> attribute, Class<?> entityAttributeType, Class<?> entityAttributeElementType, Class<?> viewAttributeType, Class<?> viewAttributeElementType, boolean updatable, boolean singular) {
+    private static boolean isCompatible(jakarta.persistence.metamodel.Attribute<?, ?> attribute, Class<?> entityAttributeType, Class<?> entityAttributeElementType, Class<?> viewAttributeType, Class<?> viewAttributeElementType, boolean updatable, boolean singular) {
         // Null is the marker for ANY TYPE
         if (entityAttributeType == null) {
             return true;
@@ -848,7 +848,7 @@ private static boolean isCompatible(javax.persistence.metamodel.Attribute<?, ?>
         }
     }
 
-    private static void validateTypesCompatible(ManagedType<?> managedType, Expression expression, Class<?> targetType, Class<?> targetElementType, boolean updatable, boolean singular, Map<String, javax.persistence.metamodel.Type<?>> rootTypes, MetamodelBuildingContext context, ExpressionLocation expressionLocation, String location) {
+    private static void validateTypesCompatible(ManagedType<?> managedType, Expression expression, Class<?> targetType, Class<?> targetElementType, boolean updatable, boolean singular, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes, MetamodelBuildingContext context, ExpressionLocation expressionLocation, String location) {
         ScalarTargetResolvingExpressionVisitor visitor = new ScalarTargetResolvingExpressionVisitor(managedType, context.getEntityMetamodel(), context.getJpqlFunctions(), rootTypes);
 
         try {
@@ -930,7 +930,7 @@ public void checkAttribute(ManagedType<?> managedType, MetamodelBuildingContext
         Class<?> keyType = null;
         Class<?> elementType = null;
         ManagedType<?> elementManagedType;
-        javax.persistence.metamodel.Attribute<?, ?> elementAttribute;
+        jakarta.persistence.metamodel.Attribute<?, ?> elementAttribute;
         if (possibleTargetTypes.size() != 1) {
             if (getElementType() instanceof ManagedViewType<?>) {
                 elementManagedType = context.getEntityMetamodel().getManagedType(((ManagedViewType<?>) getElementType()).getEntityClass());
@@ -1131,7 +1131,7 @@ public void checkAttribute(ManagedType<?> managedType, MetamodelBuildingContext
                     correlationPredicate.accept(aliasReplacementVisitor);
                     // Finally we validate that the expression
                     try {
-                        Map<String, javax.persistence.metamodel.Type<?>> rootTypes = new HashMap<>(declaringType.getEntityViewRootTypes());
+                        Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes = new HashMap<>(declaringType.getEntityViewRootTypes());
                         rootTypes.put(correlationKeyAlias, managedType);
                         ScalarTargetResolvingExpressionVisitor correlationVisitor = new ScalarTargetResolvingExpressionVisitor(correlated, context.getEntityMetamodel(), context.getJpqlFunctions(), rootTypes);
                         correlationPredicate.accept(correlationVisitor);
@@ -1171,7 +1171,7 @@ public void checkAttribute(ManagedType<?> managedType, MetamodelBuildingContext
                     // I guess these attributes are not "updatable" but that probably depends on the decision regarding collections as they have a similar problem
                     // A collection itself might not be "updatable" but it's elements could be. This is roughly the same problem
                     mappingExpression.accept(updatableVisitor);
-                    Map<javax.persistence.metamodel.Attribute<?, ?>, javax.persistence.metamodel.Type<?>> possibleTargets = updatableVisitor.getPossibleTargets();
+                    Map<jakarta.persistence.metamodel.Attribute<?, ?>, jakarta.persistence.metamodel.Type<?>> possibleTargets = updatableVisitor.getPossibleTargets();
 
                     if (possibleTargets.size() > 1) {
                         context.addError("Multiple possible target type for the mapping in the " + getLocation() + ": " + possibleTargets);
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodAttribute.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodAttribute.java
index 74148b5241..2536b0f33f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodAttribute.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodAttribute.java
@@ -23,9 +23,9 @@
 import com.blazebit.persistence.view.metamodel.Type;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -220,7 +220,7 @@ private Class<?> getPluralContainerType(MetamodelBuildingContext context) {
                 UpdatableExpressionVisitor visitor = new UpdatableExpressionVisitor(context.getEntityMetamodel(), getDeclaringType().getEntityClass(), isUpdatable(), getDeclaringType().getEntityViewRootTypes());
                 try {
                     mappingExpression.accept(visitor);
-                    Map<Attribute<?, ?>, javax.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
+                    Map<Attribute<?, ?>, jakarta.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
 
                     if (possibleTargets.size() > 1) {
                         context.addError("Multiple possible target type for the mapping in the " + getLocation() + ": " + possibleTargets);
@@ -301,7 +301,7 @@ public void checkAttribute(ManagedType<?> managedType, MetamodelBuildingContext
                     for (String value : writableMappedByMappings.values()) {
                         visitor.clear();
                         context.getTypeValidationExpressionFactory().createPathExpression(value).accept(visitor);
-                        Map<Attribute<?, ?>, javax.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
+                        Map<Attribute<?, ?>, jakarta.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
                         if (possibleTargets.size() > 1) {
                             context.addError("Multiple possible target type for the mapping in the " + getLocation() + ": " + possibleTargets);
                         }
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodPluralAttribute.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodPluralAttribute.java
index 4ca98c3c0e..d4f321f8ab 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodPluralAttribute.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodPluralAttribute.java
@@ -14,7 +14,7 @@
 import com.blazebit.persistence.view.metamodel.Type;
 import com.blazebit.persistence.view.metamodel.ViewType;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodSingularAttribute.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodSingularAttribute.java
index ba045fd9a7..0ee4e05133 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodSingularAttribute.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodSingularAttribute.java
@@ -18,8 +18,8 @@
 import com.blazebit.persistence.view.metamodel.Type;
 import com.blazebit.persistence.view.spi.type.VersionBasicUserType;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -116,7 +116,7 @@ public AbstractMethodSingularAttribute(ManagedViewTypeImplementor<X> viewType, M
         ManagedType<?> managedType = context.getEntityMetamodel().getManagedType(declaringType.getEntityClass());
         this.mappedBy = mapping.determineMappedBy(managedType, this.mapping, context, embeddableMapping);
         this.disallowOwnedUpdatableSubview = context.isDisallowOwnedUpdatableSubview() && mapping.determineDisallowOwnedUpdatableSubview(context, embeddableMapping, updateMappableAttribute) && type instanceof ManagedViewType<?> && mappedBy == null
-                && updateMappableAttribute != null && updateMappableAttribute.getPersistentAttributeType() != javax.persistence.metamodel.Attribute.PersistentAttributeType.EMBEDDED;
+                && updateMappableAttribute != null && updateMappableAttribute.getPersistentAttributeType() != jakarta.persistence.metamodel.Attribute.PersistentAttributeType.EMBEDDED;
 
         // The declaring type must be mutable, otherwise attributes can't have cascading
         if (mapping.isId() || mapping.isVersion() || !declaringType.isUpdatable() && !declaringType.isCreatable()) {
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AttributeMapping.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AttributeMapping.java
index 6001d474dd..3e197d9b03 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AttributeMapping.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AttributeMapping.java
@@ -17,8 +17,8 @@
 import com.blazebit.persistence.view.spi.EntityViewAttributeMapping;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.annotation.Annotation;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/BasicTypeImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/BasicTypeImpl.java
index 8620d0153c..984fed6204 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/BasicTypeImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/BasicTypeImpl.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Type;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedFlatViewType.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedFlatViewType.java
index dd873e61d8..4e485a5aed 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedFlatViewType.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedFlatViewType.java
@@ -21,7 +21,7 @@
 import com.blazebit.persistence.view.metamodel.ViewRoot;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -242,7 +242,7 @@ public Set<ViewRoot> getEntityViewRoots() {
     }
 
     @Override
-    public Map<String, javax.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
+    public Map<String, jakarta.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
         return delegate.getEntityViewRootTypes();
     }
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewMapping.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewMapping.java
index af2203fc0f..a0babb1154 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewMapping.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewMapping.java
@@ -18,7 +18,7 @@
 import com.blazebit.persistence.view.spi.EntityViewRootMapping;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -214,7 +214,7 @@ public Set<ViewRoot> getViewRoots(MetamodelBuildingContext context) {
     }
 
     @Override
-    public Map<String, javax.persistence.metamodel.Type<?>> getViewRootTypes(MetamodelBuildingContext context) {
+    public Map<String, jakarta.persistence.metamodel.Type<?>> getViewRootTypes(MetamodelBuildingContext context) {
         return delegate.getViewRootTypes(context);
     }
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewType.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewType.java
index 4dffa6a67b..c797c518f5 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewType.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ConvertedViewType.java
@@ -22,7 +22,7 @@
 import com.blazebit.persistence.view.metamodel.ViewRoot;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -274,7 +274,7 @@ public Set<ViewRoot> getEntityViewRoots() {
     }
 
     @Override
-    public Map<String, javax.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
+    public Map<String, jakarta.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
         return delegate.getEntityViewRootTypes();
     }
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/FlatViewTypeImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/FlatViewTypeImpl.java
index 3fcbeb6ec5..03600d9eda 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/FlatViewTypeImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/FlatViewTypeImpl.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.metamodel.FlatViewType;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImpl.java
index 50428fb231..ecf69de548 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImpl.java
@@ -68,14 +68,14 @@
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PrePersist;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
@@ -148,7 +148,7 @@ public abstract class ManagedViewTypeImpl<X> implements ManagedViewTypeImplement
     private final boolean hasJoinFetchedCollections;
     private final boolean hasSelectOrSubselectFetchedAttributes;
     private final boolean hasJpaManagedAttributes;
-    private final Map<String, javax.persistence.metamodel.Type<?>> viewRootTypes;
+    private final Map<String, jakarta.persistence.metamodel.Type<?>> viewRootTypes;
     private final Set<ViewRoot> viewRoots = new LinkedHashSet<>();
     private final Set<CTEProvider> cteProviders = new LinkedHashSet<>();
 
@@ -250,7 +250,7 @@ public ManagedViewTypeImpl(ViewMapping viewMapping, ManagedType<?> managedType,
                 SingularAttribute<?, ?> attribute = (SingularAttribute<?, ?>) extendedAttribute.getAttribute();
                 if (!attribute.isVersion() && !attribute.isOptional() && !extendedAttribute.getElementClass().isPrimitive()) {
                     // The attribute could be the id attribute of an owned *ToOne association
-                    if ((attribute.getType().getPersistenceType() == javax.persistence.metamodel.Type.PersistenceType.BASIC || attribute.getType() instanceof EmbeddableType<?>) && extendedAttribute.getAttributePath().size() > 1) {
+                    if ((attribute.getType().getPersistenceType() == jakarta.persistence.metamodel.Type.PersistenceType.BASIC || attribute.getType() instanceof EmbeddableType<?>) && extendedAttribute.getAttributePath().size() > 1) {
                         List<Attribute<?, ?>> attributePath = extendedAttribute.getAttributePath();
                         // So we check the *ToOne attribute instead
                         for (int i = attributePath.size() - 2; i >= 0; i--) {
@@ -1395,7 +1395,7 @@ public Set<ViewRoot> getEntityViewRoots() {
     }
 
     @Override
-    public Map<String, javax.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
+    public Map<String, jakarta.persistence.metamodel.Type<?>> getEntityViewRootTypes() {
         return viewRootTypes;
     }
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImplementor.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImplementor.java
index 6c66a90434..0b89e69cd6 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImplementor.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ManagedViewTypeImplementor.java
@@ -11,8 +11,8 @@
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
 import com.blazebit.persistence.view.metamodel.OrderByItem;
 
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MappingConstructorImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MappingConstructorImpl.java
index d37486bc6a..c5258320ec 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MappingConstructorImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MappingConstructorImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.metamodel.MappingConstructor;
 import com.blazebit.persistence.view.metamodel.ParameterAttribute;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContext.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContext.java
index 9e4ac46498..8ba86948d0 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContext.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContext.java
@@ -21,7 +21,7 @@
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.List;
@@ -54,7 +54,7 @@ public interface MetamodelBuildingContext {
      * @param mapping The mapping annotation
      * @return The possible target types or <code>null</code>
      */
-    public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTargetTypes(Class<?> entityClass, Attribute<?, ?> rootAttribute, Annotation mapping, Map<String, javax.persistence.metamodel.Type<?>> rootTypes);
+    public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTargetTypes(Class<?> entityClass, Attribute<?, ?> rootAttribute, Annotation mapping, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes);
 
     public Map<String, JpqlFunction> getJpqlFunctions();
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
index d7e2b925a7..15ae636cba 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelBuildingContextImpl.java
@@ -45,11 +45,11 @@
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -265,7 +265,7 @@ public <X> Map<Class<?>, TypeConverter<?, X>> getTypeConverter(Class<X> type) {
     }
 
     @Override
-    public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTargetTypes(Class<?> entityClass, Attribute<?, ?> rootAttribute, Annotation mapping, Map<String, javax.persistence.metamodel.Type<?>> rootTypes) {
+    public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTargetTypes(Class<?> entityClass, Attribute<?, ?> rootAttribute, Annotation mapping, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes) {
         ManagedType<?> managedType = entityMetamodel.getManagedType(entityClass);
         String expression;
         if (mapping instanceof Mapping) {
@@ -292,7 +292,7 @@ public List<ScalarTargetResolvingExpressionVisitor.TargetType> getPossibleTarget
             MappingCorrelated m = (MappingCorrelated) mapping;
             CorrelationProviderFactory correlationProviderFactory = CorrelationProviderHelper.getFactory(m.correlator());
             ScalarTargetResolvingExpressionVisitor resolver = new ScalarTargetResolvingExpressionVisitor(entityClass, getEntityMetamodel(), getJpqlFunctions(), rootTypes);
-            javax.persistence.metamodel.Type<?> type = TypeExtractingCorrelationBuilder.extractType(correlationProviderFactory, "_alias", this, resolver);
+            jakarta.persistence.metamodel.Type<?> type = TypeExtractingCorrelationBuilder.extractType(correlationProviderFactory, "_alias", this, resolver);
             if (type == null) {
                 // We can't determine the managed type
                 return Collections.emptyList();
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelUtils.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelUtils.java
index 7375f10deb..def2f86ead 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelUtils.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MetamodelUtils.java
@@ -14,9 +14,9 @@
 import com.blazebit.persistence.view.metamodel.MappingConstructor;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.OrderColumn;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ListAttribute;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ListAttribute;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -112,8 +112,8 @@ public static boolean isIndexedList(EntityMetamodel metamodel, ExpressionFactory
     public static boolean isIndexedList(EntityMetamodel metamodel, Class<?> entityClass, Expression expression, String mapping) {
         PathTargetResolvingExpressionVisitor visitor = new PathTargetResolvingExpressionVisitor(metamodel, metamodel.managedType(entityClass), null);
         expression.accept(visitor);
-        Map<Attribute<?, ?>, javax.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
-        Iterator<Map.Entry<Attribute<?, ?>, javax.persistence.metamodel.Type<?>>> iter = possibleTargets.entrySet().iterator();
+        Map<Attribute<?, ?>, jakarta.persistence.metamodel.Type<?>> possibleTargets = visitor.getPossibleTargets();
+        Iterator<Map.Entry<Attribute<?, ?>, jakarta.persistence.metamodel.Type<?>>> iter = possibleTargets.entrySet().iterator();
         // It must have one, otherwise a parse error would have been thrown already
         Map.Entry<Attribute<?, ?>, ?> targetEntry = iter.next();
         boolean indexed = isIndexedList(targetEntry.getKey());
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MethodAttributeMapping.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MethodAttributeMapping.java
index 7c424bfa88..89e5c2dc51 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MethodAttributeMapping.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/MethodAttributeMapping.java
@@ -34,10 +34,10 @@
 import com.blazebit.persistence.view.metamodel.PluralAttribute;
 import com.blazebit.persistence.view.spi.EntityViewMethodAttributeMapping;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ParameterAttributeMapping.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ParameterAttributeMapping.java
index 4269ad0e2d..c72949bec5 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ParameterAttributeMapping.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ParameterAttributeMapping.java
@@ -28,8 +28,8 @@
 import com.blazebit.persistence.view.spi.EntityViewMapping;
 import com.blazebit.persistence.view.spi.EntityViewParameterMapping;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Type;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMapping.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMapping.java
index 6b9d4dff58..71357b3b32 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMapping.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMapping.java
@@ -12,8 +12,8 @@
 import com.blazebit.persistence.view.spi.EntityViewMapping;
 import com.blazebit.persistence.view.spi.EntityViewRootMapping;
 
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Type;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
index 995ad9466e..86f86a26f8 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMappingImpl.java
@@ -29,12 +29,12 @@
 import com.blazebit.persistence.view.spi.EntityViewRootMapping;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MappedSuperclassType;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MappedSuperclassType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
@@ -406,7 +406,7 @@ private void initViewRoots(MetamodelBuildingContext context) {
                 String joinExpression = entityViewRoot.getJoinExpression();
                 Class<? extends CorrelationProvider> correlationProvider = entityViewRoot.getCorrelationProvider();
                 CorrelationProviderFactory correlationProviderFactory = null;
-                javax.persistence.metamodel.Type<?> type = null;
+                jakarta.persistence.metamodel.Type<?> type = null;
                 String conditionExpression = entityViewRoot.getConditionExpression();
 
                 if (entityClass != null) {
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMetamodelImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMetamodelImpl.java
index 12c930db82..d947d7fc52 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMetamodelImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewMetamodelImpl.java
@@ -20,9 +20,9 @@
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 import com.blazebit.reflection.ReflectionUtils;
 
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Constructor;
@@ -189,11 +189,11 @@ private String createValue(ManagedType<?> jpaManagedType, Object instance, Map<C
 
             // Try to set any value on instance so that it would differ from instance1
             for (SingularAttribute<?, ?> jpaAttribute : jpaAttributes) {
-                javax.persistence.metamodel.Type<?> type = jpaAttribute.getType();
+                jakarta.persistence.metamodel.Type<?> type = jpaAttribute.getType();
                 Class<?> attributeType = JpaMetamodelUtils.resolveFieldClass(javaType, jpaAttribute);
                 Object value = typeTestValues.get(attributeType);
                 if (value == null) {
-                    if (type.getPersistenceType() == javax.persistence.metamodel.Type.PersistenceType.BASIC) {
+                    if (type.getPersistenceType() == jakarta.persistence.metamodel.Type.PersistenceType.BASIC) {
                         if (attributeType.isEnum()) {
                             value = attributeType.getEnumConstants()[0];
                         } else {
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewRootImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewRootImpl.java
index e2b4636a96..c032395764 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewRootImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewRootImpl.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.view.metamodel.OrderByItem;
 import com.blazebit.persistence.view.metamodel.ViewRoot;
 
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Type;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewTypeImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewTypeImpl.java
index 4e44101caf..482df9bb5f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewTypeImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewTypeImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
 import com.blazebit.persistence.view.metamodel.ViewFilterMapping;
 
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collections;
@@ -78,7 +78,7 @@ public ViewTypeImpl(ViewMapping viewMapping, ManagedType<?> managedType, Metamod
             LOG.warning("The method for the " + ((AbstractMethodAttribute<?, ?>) idAttribute).getLocation() + " is non-public and declared in a different package " + javaMethod.getDeclaringClass().getPackage() + " than the view type " + getJavaType().getName() +
                     " which makes it impossible to allow checking for equality with user provided implementations of the view type. If you don't need that, you can ignore this warning.");
             // We also disallow interface equality when the view is defined for an abstract entity type
-        } else if (getJpaManagedType().getPersistenceType() != javax.persistence.metamodel.Type.PersistenceType.ENTITY || java.lang.reflect.Modifier.isAbstract(getJpaManagedType().getJavaType().getModifiers())) {
+        } else if (getJpaManagedType().getPersistenceType() != jakarta.persistence.metamodel.Type.PersistenceType.ENTITY || java.lang.reflect.Modifier.isAbstract(getJpaManagedType().getJavaType().getModifiers())) {
             supportsUserTypeEquals = false;
             LOG.warning("The view class " + getJavaType().getName() + " is defined for an abstract or non-entity type which is why id-based equality can't be checked on a user provided instance. If you don't need that, you can ignore this warning.");
         }
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilderTemplate.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilderTemplate.java
index 0c49d1d946..00132eba89 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilderTemplate.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilderTemplate.java
@@ -95,9 +95,9 @@
 import com.blazebit.persistence.view.spi.type.BasicUserTypeStringSupport;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -1251,7 +1251,7 @@ private int addViewRootMappingIfNeeded(TupleElementMapperBuilder mapperBuilder,
             if (viewRootMapping) {
                 features.add(Feature.SUBQUERY_CORRELATION);
                 viewRootIndex = tupleOffset + mapperBuilder.mapperIndex();
-                javax.persistence.metamodel.SingularAttribute<?, ?> singleIdAttribute = JpaMetamodelUtils.getSingleIdAttribute((IdentifiableType<?>) viewRoot.getJpaManagedType());
+                jakarta.persistence.metamodel.SingularAttribute<?, ?> singleIdAttribute = JpaMetamodelUtils.getSingleIdAttribute((IdentifiableType<?>) viewRoot.getJpaManagedType());
                 mapperBuilder.addMapper(createMapper((BasicUserTypeStringSupport<?>) null, singleIdAttribute.getName(), subviewAliasPrefix + "_view_root_id", attributePath, null, null, EMPTY));
             }
         }
@@ -1271,7 +1271,7 @@ private int addEmbeddingViewMappingIfNeeded(TupleElementMapperBuilder mapperBuil
             }
             if (embeddingViewMapping) {
                 embeddingViewIndex = tupleOffset + mapperBuilder.mapperIndex();
-                javax.persistence.metamodel.SingularAttribute<?, ?> singleIdAttribute = JpaMetamodelUtils.getSingleIdAttribute((IdentifiableType<?>) viewType.getJpaManagedType());
+                jakarta.persistence.metamodel.SingularAttribute<?, ?> singleIdAttribute = JpaMetamodelUtils.getSingleIdAttribute((IdentifiableType<?>) viewType.getJpaManagedType());
                 mapperBuilder.addMapper(createMapper((BasicUserTypeStringSupport<?>) null, singleIdAttribute.getName(), subviewAliasPrefix + "_embedding_view_id", attributePath, null, null, EMPTY));
             }
         }
@@ -1285,8 +1285,8 @@ private boolean correlatesThis(EntityViewManagerImpl evm, ExpressionFactory ef,
         ExtendedManagedType<?> managedType = evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, managedTypeClass);
         ExtendedManagedType<?> correlationBasisManagedType = evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, correlationBasisEntity);
 
-        Iterator<? extends javax.persistence.metamodel.SingularAttribute<?, ?>> iterator = managedType.getIdAttributes().iterator();
-        javax.persistence.metamodel.SingularAttribute<?, ?> idAttribute = iterator.next();
+        Iterator<? extends jakarta.persistence.metamodel.SingularAttribute<?, ?>> iterator = managedType.getIdAttributes().iterator();
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> idAttribute = iterator.next();
         if (iterator.hasNext()) {
             return false;
         }
@@ -1316,7 +1316,7 @@ private boolean correlatesThis(EntityViewManagerImpl evm, ExpressionFactory ef,
                     || "this".equalsIgnoreCase(right) && correlationKeyAlias.equals(left);
         } else if (correlationBasisExpression.equals(idAttribute.getName())) {
             iterator = correlationBasisManagedType.getIdAttributes().iterator();
-            javax.persistence.metamodel.SingularAttribute<?, ?> correlatedIdAttribute = iterator.next();
+            jakarta.persistence.metamodel.SingularAttribute<?, ?> correlatedIdAttribute = iterator.next();
             if (iterator.hasNext()) {
                 return false;
             }
@@ -1352,7 +1352,7 @@ private Type<?> getType(Attribute<?, ?> attribute) {
         }
     }
 
-    private Class<?> getCorrelationBasisType(Expression correlationBasisExpression, String correlationBasis, Map<String, javax.persistence.metamodel.Type<?>> rootTypes) {
+    private Class<?> getCorrelationBasisType(Expression correlationBasisExpression, String correlationBasis, Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes) {
         if (correlationBasis.isEmpty()) {
             return managedTypeClass;
         }
@@ -1387,7 +1387,7 @@ private BasicUserTypeStringSupport<Object> getCorrelationKeyExpressionBasicTypeS
         if (correlationBasisEntity == null) {
             return (BasicUserTypeStringSupport<Object>) evm.getMetamodel().getBasicUserType(correlationBasisType);
         }
-        javax.persistence.metamodel.SingularAttribute<?, ?> idAttribute = ((ExtendedManagedType<?>) evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, correlationBasisEntity))
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> idAttribute = ((ExtendedManagedType<?>) evm.getMetamodel().getEntityMetamodel().getManagedType(ExtendedManagedType.class, correlationBasisEntity))
                 .getIdAttributes()
                 .iterator()
                 .next();
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/mapper/TupleElementMapperBuilder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/mapper/TupleElementMapperBuilder.java
index 588703e782..fd2e295104 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/mapper/TupleElementMapperBuilder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/mapper/TupleElementMapperBuilder.java
@@ -27,11 +27,11 @@
 import com.blazebit.persistence.view.metamodel.ParameterAttribute;
 import com.blazebit.persistence.view.metamodel.SubqueryAttribute;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -168,7 +168,7 @@ public String getMapping(Expression expression, Class<?> expressionType) {
             return getMapping(expression);
         }
 
-        javax.persistence.metamodel.SingularAttribute<?, ?> idAttr = idAttributes.iterator().next();
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> idAttr = idAttributes.iterator().next();
         if (ExpressionUtils.isEmptyOrThis(expression)) {
             return getMapping(mappingPrefix, idAttr.getName());
         } else {
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedBatchTupleListTransformer.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedBatchTupleListTransformer.java
index 2002dabb66..acd17d64ed 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedBatchTupleListTransformer.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedBatchTupleListTransformer.java
@@ -26,9 +26,9 @@
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
 import com.blazebit.persistence.view.metamodel.ViewType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedSubselectTupleTransformer.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedSubselectTupleTransformer.java
index 1c63e8b0fd..5c43e9e82a 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedSubselectTupleTransformer.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedSubselectTupleTransformer.java
@@ -36,9 +36,9 @@
 import com.blazebit.persistence.view.spi.EmbeddingViewJpqlMacro;
 import com.blazebit.persistence.view.spi.ViewJpqlMacro;
 
-import javax.persistence.Parameter;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedTupleListTransformer.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedTupleListTransformer.java
index ccb6f018e6..1971db0df2 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedTupleListTransformer.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/AbstractCorrelatedTupleListTransformer.java
@@ -20,9 +20,9 @@
 import com.blazebit.persistence.view.impl.objectbuilder.Limiter;
 import com.blazebit.persistence.view.impl.objectbuilder.transformer.TupleListTransformer;
 
-import javax.persistence.Parameter;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedSingularBatchTupleListTransformer.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedSingularBatchTupleListTransformer.java
index 41e41e325d..cd29f7862c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedSingularBatchTupleListTransformer.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedSingularBatchTupleListTransformer.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.view.impl.metamodel.ManagedViewTypeImplementor;
 import com.blazebit.persistence.view.impl.objectbuilder.Limiter;
 
-import javax.persistence.NonUniqueResultException;
+import jakarta.persistence.NonUniqueResultException;
 import java.util.List;
 import java.util.Map;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/JoinCorrelationBuilder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/JoinCorrelationBuilder.java
index 8bc2d43402..e8c9568979 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/JoinCorrelationBuilder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/JoinCorrelationBuilder.java
@@ -21,7 +21,7 @@
 import com.blazebit.persistence.view.CorrelationBuilder;
 import com.blazebit.persistence.view.impl.objectbuilder.Limiter;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Map;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/MultisetCorrelationBuilder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/MultisetCorrelationBuilder.java
index 9a610fb705..4737849edd 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/MultisetCorrelationBuilder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/MultisetCorrelationBuilder.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.spi.ServiceProvider;
 import com.blazebit.persistence.view.CorrelationBuilder;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/SubqueryCorrelationBuilder.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/SubqueryCorrelationBuilder.java
index 0e6fa6bc67..a6ef6a2cd3 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/SubqueryCorrelationBuilder.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/SubqueryCorrelationBuilder.java
@@ -19,7 +19,7 @@
 import com.blazebit.persistence.view.CorrelationBuilder;
 import com.blazebit.persistence.view.impl.objectbuilder.Limiter;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Map;
 
 /**
diff --git a/entity-view/impl/src/main/java9/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java
similarity index 100%
rename from entity-view/impl/src/main/java9/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java
rename to entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
index acf6e30cde..18a5d34fba 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/ProxyFactory.java
@@ -75,9 +75,9 @@
 import javassist.compiler.SymbolTable;
 import javassist.compiler.ast.Stmnt;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -1001,7 +1001,6 @@ private <T> Class<? extends T> defineOrGetClass(Class<?> clazz, Class<?> neighbo
 
     private <T> Class<? extends T> defineOrGetClass(EntityViewManager entityViewManager, boolean unsafe, Class<?> clazz, Class<?> neighbourClazz, CtClass cc) throws IOException, IllegalAccessException, NoSuchFieldException, CannotCompileException {
         Class<? extends T> c;
-        boolean newlyDefined = false;
         try {
             // Ask the package opener to allow deep access, otherwise defining the class will fail
             if (clazz.getPackage() != null) {
@@ -1013,7 +1012,6 @@ private <T> Class<? extends T> defineOrGetClass(EntityViewManager entityViewMana
             }
 
             c = (Class<? extends T>) UnsafeHelper.define(cc.getName(), cc.toBytecode(), neighbourClazz);
-            newlyDefined = true;
         } catch (CannotCompileException | LinkageError ex) {
             // If there are multiple proxy factories for the same class loader
             // we could end up in defining a class multiple times, so we check if the classloader
@@ -1042,23 +1040,14 @@ private <T> Class<? extends T> defineOrGetClass(EntityViewManager entityViewMana
             }
         }
         if (entityViewManager != null) {
-            updateEvmReferences(c, entityViewManager, !newlyDefined);
+            updateEvmReferences(c, entityViewManager );
         }
         return c;
     }
 
-    private void updateEvmReferences(Class<?> entityViewClass, EntityViewManager evm, boolean updateSerializableEvmDelegate) {
+    private void updateEvmReferences(Class<?> entityViewClass, EntityViewManager evm) {
         try {
             entityViewClass.getField(SerializableEntityViewManager.EVM_FIELD_NAME).set(null, evm);
-            if (updateSerializableEvmDelegate) {
-                SerializableEntityViewManager serializableEvm =
-                    (SerializableEntityViewManager) entityViewClass.getField(
-                        SerializableEntityViewManager.SERIALIZABLE_EVM_FIELD_NAME).get(null);
-                Field serializableEvmDelegateField = SerializableEntityViewManager.class.getDeclaredField(
-                    SerializableEntityViewManager.SERIALIZABLE_EVM_DELEGATE_FIELD_NAME);
-                serializableEvmDelegateField.setAccessible(true);
-                serializableEvmDelegateField.set(serializableEvm, evm);
-            }
         } catch (IllegalAccessException | NoSuchFieldException e) {
             throw new RuntimeException(e);
         }
@@ -1902,7 +1891,7 @@ private CtMethod addSetter(AbstractMethodAttribute<?, ?> attribute, CtClass cc,
                     if (jpaEntity) {
                         IdentifiableType<?> identifiableType = (IdentifiableType<?>) basicType.getManagedType();
 
-                        for (javax.persistence.metamodel.SingularAttribute<?, ?> idAttribute : JpaMetamodelUtils.getIdAttributes(identifiableType)) {
+                        for (jakarta.persistence.metamodel.SingularAttribute<?, ?> idAttribute : JpaMetamodelUtils.getIdAttributes(identifiableType)) {
                             Class<?> idClass = JpaMetamodelUtils.resolveFieldClass(basicType.getJavaType(), idAttribute);
                             String idAccessor = addIdAccessor(cc, identifiableType, idAttribute, pool.get(idClass.getName()));
                             sb.append(" && ");
@@ -3257,7 +3246,7 @@ private String addMakeMethodAccessible(CtClass declaringClass) throws NotFoundEx
         return declaringClass.getName() + "#" + name;
     }
 
-    private String addIdAccessor(CtClass declaringClass, IdentifiableType<?> type, javax.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute, CtClass idType) throws NotFoundException, CannotCompileException {
+    private String addIdAccessor(CtClass declaringClass, IdentifiableType<?> type, jakarta.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute, CtClass idType) throws NotFoundException, CannotCompileException {
         String name = "$$_" + ((EntityType<?>) type).getName() + "_" + jpaIdAttribute.getName();
         CtMethod[] methods = declaringClass.getDeclaredMethods();
         for (int i = 0; i < methods.length; i++) {
@@ -3499,11 +3488,11 @@ private String getGenericSignature(MethodAttribute<?, ?> attribute, CtField attr
 
     public void clear() {
         for (Class<?> proxyClass : proxyClasses.values()) {
-            updateEvmReferences(proxyClass, null, true);
+            updateEvmReferences(proxyClass, null );
         }
         proxyClasses.clear();
         for (Class<?> unsafeProxyClass : unsafeProxyClasses.values()) {
-            updateEvmReferences(unsafeProxyClass, null, true);
+            updateEvmReferences(unsafeProxyClass, null );
         }
         unsafeProxyClasses.clear();
         baseClasses.clear();
diff --git a/entity-view/impl/src/main/java9/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java
similarity index 100%
rename from entity-view/impl/src/main/java9/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java
rename to entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaResources.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaResources.java
index 5013e52c9b..a73cf97e33 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaResources.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaResources.java
@@ -10,10 +10,10 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 
 /**
  * @author Christian Beikov
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaTransactionSynchronizationStrategy.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaTransactionSynchronizationStrategy.java
index 6edc0f2708..a4b6cf8130 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaTransactionSynchronizationStrategy.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/JtaTransactionSynchronizationStrategy.java
@@ -9,11 +9,11 @@
 import com.blazebit.persistence.view.spi.TransactionAccess;
 import com.blazebit.persistence.view.spi.TransactionSupport;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/SynchronizationRegistry.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/SynchronizationRegistry.java
index 90d0db9141..b15c6adc30 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/SynchronizationRegistry.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/SynchronizationRegistry.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.view.spi.TransactionAccess;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java
index 24c2eaa9ae..648a4fed4e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java
@@ -10,7 +10,7 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/DefaultUpdateContext.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/DefaultUpdateContext.java
index 6e3a240a1b..07b74e435d 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/DefaultUpdateContext.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/DefaultUpdateContext.java
@@ -42,8 +42,8 @@
 import com.blazebit.persistence.view.spi.TransactionAccess;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.EntityManager;
-import javax.transaction.Synchronization;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Synchronization;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java
index f1217759e1..586fb92ff4 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java
@@ -81,12 +81,12 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.spi.type.VersionBasicUserType;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -190,8 +190,8 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, Map<Object, EntityViewUp
 
         Set<MethodAttribute<?, ?>> attributes = (Set<MethodAttribute<?, ?>>) (Set<?>) viewType.getAttributes();
         String idAttributeName = null;
-        javax.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute = null;
-        javax.persistence.metamodel.SingularAttribute<?, ?> viewIdMappingAttribute = null;
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute = null;
+        jakarta.persistence.metamodel.SingularAttribute<?, ?> viewIdMappingAttribute = null;
         AbstractMethodAttribute<?, ?> idAttribute;
         AbstractMethodAttribute<?, ?> versionAttribute;
 
@@ -340,7 +340,7 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, Map<Object, EntityViewUp
                         ExtendedManagedType managedType = entityMetamodel.getManagedType(ExtendedManagedType.class, extendedAttribute.getElementClass());
                         deleter = new UnmappedWritableBasicAttributeSetNullCascadeDeleter(evm, entityType, managedType, extendedAttribute.getWritableMappedByMappings((EntityType<?>) managedType.getType()));
                     } else {
-                        if (((javax.persistence.metamodel.PluralAttribute<?, ?, ?>) extendedAttribute.getAttribute()).getCollectionType() == javax.persistence.metamodel.PluralAttribute.CollectionType.MAP) {
+                        if (((jakarta.persistence.metamodel.PluralAttribute<?, ?, ?>) extendedAttribute.getAttribute()).getCollectionType() == jakarta.persistence.metamodel.PluralAttribute.CollectionType.MAP) {
                             deleter = new UnmappedMapAttributeCascadeDeleter(evm, unmappedAttributeName, extendedAttribute, entityClass, idAttributeName, false);
                         } else {
                             deleter = new UnmappedCollectionAttributeCascadeDeleter(evm, unmappedAttributeName, extendedAttribute, entityClass, idAttributeName, false);
@@ -520,7 +520,7 @@ private static void buildComponentFlushers(EntityViewManagerImpl evm, Class<?> e
                 throw new IllegalArgumentException("Plural attributes in embeddable types aren't supported yet! Remove attribute " + attribute.getName() + " of type " + attribute.getDeclaringType().getJavaType().getName() + " or use an entity view instead of the embeddable type!");
             }
             SingularAttribute<?, ?> attr = (SingularAttribute<?, ?>) attribute;
-            if (attr.getType() instanceof javax.persistence.metamodel.BasicType<?>) {
+            if (attr.getType() instanceof jakarta.persistence.metamodel.BasicType<?>) {
                 String attributeName = attributePrefix + attribute.getName();
                 String attributeMapping = mappingPrefix + attribute.getName();
                 String parameterName = attributeName;
@@ -986,7 +986,7 @@ public void remove(UpdateContext context, Object viewId) {
                 }
                 subviewIdAccessor = Accessors.forSubviewAssociationId(evm, attributeViewType, attributeElementIdMapping, true);
                 Attribute<?, ?> attributeIdAttribute = attributeViewType.getJpaManagedType().getAttribute(attributeElementIdMapping);
-                javax.persistence.metamodel.Type<?> attributeIdAttributeType = entityMetamodel.type(JpaMetamodelUtils.resolveFieldClass(attributeViewType.getEntityClass(), attributeIdAttribute));
+                jakarta.persistence.metamodel.Type<?> attributeIdAttributeType = entityMetamodel.type(JpaMetamodelUtils.resolveFieldClass(attributeViewType.getEntityClass(), attributeIdAttribute));
                 List<String> idComponentMappings;
                 boolean requiresComponentWiseSetInUpdate = true;
 
@@ -1162,7 +1162,7 @@ public void remove(UpdateContext context, Object viewId) {
                     }
                     subviewIdAccessor = Accessors.forSubviewAssociationId(evm, attributeViewType, attributeElementIdMapping, true);
                     Attribute<?, ?> attributeIdAttribute = attributeViewType.getJpaManagedType().getAttribute(attributeElementIdMapping);
-                    javax.persistence.metamodel.Type<?> attributeIdAttributeType = entityMetamodel.type(JpaMetamodelUtils.resolveFieldClass(attributeViewType.getEntityClass(), attributeIdAttribute));
+                    jakarta.persistence.metamodel.Type<?> attributeIdAttributeType = entityMetamodel.type(JpaMetamodelUtils.resolveFieldClass(attributeViewType.getEntityClass(), attributeIdAttribute));
                     List<String> idComponentMappings;
                     boolean requiresComponentWiseSetInUpdate = true;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ListenerManager.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ListenerManager.java
index 06d2fc944d..bdfdc739a9 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ListenerManager.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ListenerManager.java
@@ -22,7 +22,7 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/Listeners.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/Listeners.java
index 3513c7c9ef..5237eea98a 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/Listeners.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/Listeners.java
@@ -20,7 +20,7 @@
 import com.blazebit.persistence.view.impl.update.listener.ViewPreRemoveListenerImpl;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ResetInitialStateSynchronization.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ResetInitialStateSynchronization.java
index 6bf9b93417..eecc07db2a 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ResetInitialStateSynchronization.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/ResetInitialStateSynchronization.java
@@ -17,9 +17,9 @@
 import com.blazebit.persistence.view.spi.TransactionSupport;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.EntityManager;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/SimpleUpdateContext.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/SimpleUpdateContext.java
index a13eae772a..17040df2cd 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/SimpleUpdateContext.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/SimpleUpdateContext.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateContext.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateContext.java
index 582d2a0a6d..49994d8797 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateContext.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateContext.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateQueryFactory.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateQueryFactory.java
index d0d3e662ac..f9deb16805 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateQueryFactory.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/UpdateQueryFactory.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.impl.update.flush.DirtyAttributeFlusher;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java
index 84072b51de..070665ed63 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java
@@ -16,8 +16,8 @@
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/BasicAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/BasicAttributeFlusher.java
index 8904a71629..6fbe898827 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/BasicAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/BasicAttributeFlusher.java
@@ -16,7 +16,7 @@
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java
index 8105ff085a..b7f83c7951 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java
@@ -30,9 +30,9 @@
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionElementAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionElementAttributeFlusher.java
index d2460c2953..03009d8814 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionElementAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionElementAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CompositeAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CompositeAttributeFlusher.java
index 72a91e4117..1cb156292f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CompositeAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CompositeAttributeFlusher.java
@@ -32,12 +32,12 @@
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.Tuple;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -66,7 +66,7 @@ public void run() {
     private final Class<?> entityClass;
     private final boolean persistable;
     private final ViewMapper<Object, Object> persistViewMapper;
-    private final javax.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute;
+    private final jakarta.persistence.metamodel.SingularAttribute<?, ?> jpaIdAttribute;
     private final ViewToEntityMapper viewIdMapper;
     private final AttributeAccessor viewIdAccessor;
     private final AttributeAccessor entityIdAccessor;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/DirtyAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/DirtyAttributeFlusher.java
index 443477e72a..54166deb33 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/DirtyAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/DirtyAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/EmbeddableAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/EmbeddableAttributeFlusher.java
index eea320fdbe..5cc90411fd 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/EmbeddableAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/EmbeddableAttributeFlusher.java
@@ -14,7 +14,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/IndexedListAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/IndexedListAttributeFlusher.java
index 4475a82b4a..706c24e41b 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/IndexedListAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/IndexedListAttributeFlusher.java
@@ -30,8 +30,8 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseCollectionElementAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseCollectionElementAttributeFlusher.java
index ee0de6d3a7..cd278a9c46 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseCollectionElementAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseCollectionElementAttributeFlusher.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseFlusher.java
index 6225b2a654..1be70abd79 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/InverseFlusher.java
@@ -43,9 +43,9 @@
 import com.blazebit.persistence.view.metamodel.ViewType;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MapAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MapAttributeFlusher.java
index 927fb5c5c3..0ea462d608 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MapAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MapAttributeFlusher.java
@@ -35,9 +35,9 @@
 import com.blazebit.persistence.view.spi.type.BasicUserType;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.Tuple;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeCollectionElementAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeCollectionElementAttributeFlusher.java
index f985475f71..4d8788bbae 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeCollectionElementAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeCollectionElementAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapKeyAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapKeyAttributeFlusher.java
index dbfaee872a..d41f7adbae 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapKeyAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapKeyAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapValueAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapValueAttributeFlusher.java
index 04e832fb4e..ad74d21123 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapValueAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/MergeMapValueAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Map;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/ParentReferenceAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/ParentReferenceAttributeFlusher.java
index 64da1c1e42..a7922f584b 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/ParentReferenceAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/ParentReferenceAttributeFlusher.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/PersistCollectionElementAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/PersistCollectionElementAttributeFlusher.java
index 76c4528b42..f719c2b90d 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/PersistCollectionElementAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/PersistCollectionElementAttributeFlusher.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
index 6cbdd43f54..a45d3b3023 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/SubviewAttributeFlusher.java
@@ -19,7 +19,7 @@
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/TypeDescriptor.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/TypeDescriptor.java
index f41c0c9084..94a7895617 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/TypeDescriptor.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/TypeDescriptor.java
@@ -33,9 +33,9 @@
 import com.blazebit.persistence.view.spi.type.MutableBasicUserType;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedAttributeCascadeDeleterUtil.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedAttributeCascadeDeleterUtil.java
index 95f9c158b0..de8a9347c9 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedAttributeCascadeDeleterUtil.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedAttributeCascadeDeleterUtil.java
@@ -34,7 +34,7 @@ public static List<UnmappedAttributeCascadeDeleter> createUnmappedCascadeDeleter
         for (Map.Entry<String, ? extends ExtendedAttribute<?, ?>> entry : attributes.entrySet()) {
             ExtendedAttribute<?, ?> extendedAttribute = entry.getValue();
             if (extendedAttribute.getAttribute().isCollection()) {
-                if (((javax.persistence.metamodel.PluralAttribute<?, ?, ?>) extendedAttribute.getAttribute()).getCollectionType() == javax.persistence.metamodel.PluralAttribute.CollectionType.MAP) {
+                if (((jakarta.persistence.metamodel.PluralAttribute<?, ?, ?>) extendedAttribute.getAttribute()).getCollectionType() == jakarta.persistence.metamodel.PluralAttribute.CollectionType.MAP) {
                     deleters.add(new UnmappedMapAttributeCascadeDeleter(
                             evm,
                             entry.getKey(),
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedBasicAttributeCascadeDeleter.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedBasicAttributeCascadeDeleter.java
index fa8cfb3368..5887690895 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedBasicAttributeCascadeDeleter.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedBasicAttributeCascadeDeleter.java
@@ -14,10 +14,10 @@
 import com.blazebit.persistence.view.impl.EntityViewManagerImpl;
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.Tuple;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedCollectionAttributeCascadeDeleter.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedCollectionAttributeCascadeDeleter.java
index c461870449..89b22986e4 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedCollectionAttributeCascadeDeleter.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedCollectionAttributeCascadeDeleter.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.view.impl.EntityViewManagerImpl;
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedMapAttributeCascadeDeleter.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedMapAttributeCascadeDeleter.java
index 0090b277ae..740e5350ca 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedMapAttributeCascadeDeleter.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedMapAttributeCascadeDeleter.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.EntityViewManagerImpl;
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedWritableBasicAttributeSetNullCascadeDeleter.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedWritableBasicAttributeSetNullCascadeDeleter.java
index 9d6206af22..b1162d601f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedWritableBasicAttributeSetNullCascadeDeleter.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UnmappedWritableBasicAttributeSetNullCascadeDeleter.java
@@ -14,9 +14,9 @@
 import com.blazebit.persistence.view.impl.accessor.PassthroughAttributeAccessor;
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UpdateCollectionElementAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UpdateCollectionElementAttributeFlusher.java
index 4bfbd60260..6f6d390906 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UpdateCollectionElementAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/UpdateCollectionElementAttributeFlusher.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateContext;
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/VersionAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/VersionAttributeFlusher.java
index 2f56bab79b..1236bd1763 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/VersionAttributeFlusher.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/VersionAttributeFlusher.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.view.impl.update.UpdateQueryFactory;
 import com.blazebit.persistence.view.spi.type.VersionBasicUserType;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPostPersistListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPostPersistListenerImpl.java
index 218337c7cb..675b74c203 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPostPersistListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPostPersistListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostPersistEntityListener;
 import com.blazebit.persistence.view.ViewAndEntityListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPrePersistListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPrePersistListenerImpl.java
index 70b2008dab..2bb0c4ae42 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPrePersistListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewAndEntityPrePersistListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PrePersistEntityListener;
 import com.blazebit.persistence.view.ViewAndEntityListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceEntityListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceEntityListener.java
index 4b683af643..520bc5a0f2 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceEntityListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceEntityListener.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceListener.java
index c32b928801..5c79c345b7 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceListener.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostCommitListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostCommitListener.java
index aba00d443a..fe113b2c66 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostCommitListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostCommitListener.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostCommitListener;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistEntityListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistEntityListener.java
index edc05bd03d..34a3899528 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistEntityListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistEntityListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PostPersistEntityListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistListener.java
index e614642533..2c489f1d4e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostPersistListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PostPersistListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRemoveListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRemoveListener.java
index 6a91ef0c07..33fdf36706 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRemoveListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRemoveListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PostRemoveListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRollbackListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRollbackListener.java
index 54ee14e788..210a02b451 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRollbackListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostRollbackListener.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostRollbackListener;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostUpdateListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostUpdateListener.java
index 2bd546199d..09f1f23e53 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostUpdateListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePostUpdateListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PostUpdateListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistEntityListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistEntityListener.java
index 6cd1fa1486..795302f33e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistEntityListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistEntityListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PrePersistEntityListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistListener.java
index becd44b690..3c0ff36750 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePrePersistListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PrePersistListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreRemoveListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreRemoveListener.java
index 0e6ed2de86..742a68816a 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreRemoveListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreRemoveListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PreRemoveListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreUpdateListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreUpdateListener.java
index f8412a9ab7..14816bd9d5 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreUpdateListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstancePreUpdateListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.PreUpdateListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceTransitionListener.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceTransitionListener.java
index 4377e1e6d6..fb269551a7 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceTransitionListener.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewInstanceTransitionListener.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 
 /**
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostCommitListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostCommitListenerImpl.java
index f54ea82b2b..eab8f3cb81 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostCommitListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostCommitListenerImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.ViewListener;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostPersistListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostPersistListenerImpl.java
index 645a483582..d3b37cf213 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostPersistListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostPersistListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostPersistListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRemoveListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRemoveListenerImpl.java
index ece28b621c..c34b56acea 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRemoveListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRemoveListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostRemoveListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRollbackListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRollbackListenerImpl.java
index a8872fbca3..ad58f7664e 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRollbackListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostRollbackListenerImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.ViewListener;
 import com.blazebit.persistence.view.ViewTransition;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostUpdateListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostUpdateListenerImpl.java
index 4358513498..3b68f84a5f 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostUpdateListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPostUpdateListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PostUpdateListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPrePersistListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPrePersistListenerImpl.java
index 8316db1dfd..d75c94447c 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPrePersistListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPrePersistListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PrePersistListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreRemoveListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreRemoveListenerImpl.java
index c36c934663..b76e1c8c22 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreRemoveListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreRemoveListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PreRemoveListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreUpdateListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreUpdateListenerImpl.java
index aaeb56e5c8..b85058bb80 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreUpdateListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewPreUpdateListenerImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.view.PreUpdateListener;
 import com.blazebit.persistence.view.ViewListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostCommitListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostCommitListenerImpl.java
index 5d2e802f7c..ba5b15d3b6 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostCommitListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostCommitListenerImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.ViewTransition;
 import com.blazebit.persistence.view.ViewTransitionListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostRollbackListenerImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostRollbackListenerImpl.java
index 132c0e4129..1de811962b 100644
--- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostRollbackListenerImpl.java
+++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/listener/ViewTransitionPostRollbackListenerImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.view.ViewTransition;
 import com.blazebit.persistence.view.ViewTransitionListener;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/impl/src/main/java/module-info.java b/entity-view/impl/src/main/java/module-info.java
new file mode 100644
index 0000000000..41aa4cdbba
--- /dev/null
+++ b/entity-view/impl/src/main/java/module-info.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.view.impl {
+	requires java.naming;
+	requires org.javassist;
+	requires com.blazebit.persistence.core.parser;
+	requires com.blazebit.persistence.view;
+	requires jakarta.transaction;
+	requires com.blazebit.persistence.core.impl;
+	requires com.blazebit.common.utils;
+	exports com.blazebit.persistence.view.impl;
+	exports com.blazebit.persistence.view.impl.accessor;
+	exports com.blazebit.persistence.view.impl.change;
+	exports com.blazebit.persistence.view.impl.collection;
+	exports com.blazebit.persistence.view.impl.entity;
+	exports com.blazebit.persistence.view.impl.filter;
+	exports com.blazebit.persistence.view.impl.macro;
+	exports com.blazebit.persistence.view.impl.mapper;
+	exports com.blazebit.persistence.view.impl.metamodel;
+	exports com.blazebit.persistence.view.impl.metamodel.analysis;
+	exports com.blazebit.persistence.view.impl.metamodel.attribute;
+	exports com.blazebit.persistence.view.impl.objectbuilder;
+	exports com.blazebit.persistence.view.impl.objectbuilder.mapper;
+	exports com.blazebit.persistence.view.impl.objectbuilder.transformator;
+	exports com.blazebit.persistence.view.impl.objectbuilder.transformer;
+	exports com.blazebit.persistence.view.impl.objectbuilder.transformer.correlation;
+	exports com.blazebit.persistence.view.impl.proxy;
+	exports com.blazebit.persistence.view.impl.tx;
+	exports com.blazebit.persistence.view.impl.type;
+	exports com.blazebit.persistence.view.impl.update;
+	exports com.blazebit.persistence.view.impl.update.flush;
+	exports com.blazebit.persistence.view.impl.update.listener;
+	provides com.blazebit.persistence.view.spi.EntityViewConfigurationProvider with com.blazebit.persistence.view.impl.EntityViewConfigurationProviderImpl;
+	uses com.blazebit.persistence.view.spi.TransactionAccessFactory;
+}
\ No newline at end of file
diff --git a/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java b/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java
deleted file mode 100644
index 6a252277f6..0000000000
--- a/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/AddReadsInjector.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.view.impl.proxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class AddReadsInjector {
-
-    private AddReadsInjector() {
-    }
-
-    public static void addReadsModule(Class<?> clazz) {
-        // No-op for Java 8
-    }
-}
diff --git a/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java b/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java
deleted file mode 100644
index f63e71db9a..0000000000
--- a/entity-view/impl/src/main/java8/com/blazebit/persistence/view/impl/proxy/UnsafeHelper.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.view.impl.proxy;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-//CHECKSTYLE:OFF: IllegalImport
-import sun.misc.Unsafe;
-//CHECKSTYLE:ON: IllegalImport
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.6
- */
-public final class UnsafeHelper {
-
-    private static final Unsafe UNSAFE;
-    private static final Method GET_MODULE;
-    private static final Method ADD_READS;
-    private static final Method LOOKUP;
-    private static final Method PRIVATE_LOOKUP_IN;
-    private static final Method DEFINE_CLASS;
-
-    private UnsafeHelper() {
-    }
-
-    static {
-        Field f;
-        try {
-            f = Unsafe.class.getDeclaredField("theUnsafe");
-            f.setAccessible(true);
-            UNSAFE = (Unsafe) f.get(null);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Method getModule = null;
-        Method addReads = null;
-        Method lookup = null;
-        Method privateLookupIn = null;
-        Method defineClass = null;
-        try {
-            Class<?> moduleClass = Class.forName("java.lang.Module");
-            getModule = Class.class.getMethod("getModule");
-            addReads = moduleClass.getMethod("addReads", moduleClass);
-            Class<?> methodHandlesClass = Class.forName("java.lang.invoke.MethodHandles");
-            Class<?> lookupClass = Class.forName("java.lang.invoke.MethodHandles$Lookup");
-            privateLookupIn = methodHandlesClass.getMethod("privateLookupIn", Class.class, lookupClass);
-            lookup = methodHandlesClass.getMethod("lookup");
-            defineClass = lookupClass.getMethod("defineClass", byte[].class);
-
-        } catch (Exception e) {
-            // ignore
-        }
-        GET_MODULE = getModule;
-        ADD_READS = addReads;
-        LOOKUP = lookup;
-        PRIVATE_LOOKUP_IN = privateLookupIn;
-        DEFINE_CLASS = defineClass;
-    }
-
-    public static Class<?> define(String name, byte[] bytes, final Class<?> declaringClass) {
-        try {
-            ClassLoader newLoader = declaringClass.getClassLoader();
-            return UNSAFE.defineClass(name, bytes, 0, bytes.length, newLoader, null);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodError e) {
-            if (ADD_READS == null) {
-                throw e;
-            }
-            // In case of a Maven build, we might run in a class loader that refers to this module through a directory,
-            // in which case we want to fall back to the JDK9+ APIs if possible
-            try {
-                ADD_READS.invoke(GET_MODULE.invoke(UnsafeHelper.class), GET_MODULE.invoke(declaringClass));
-                return (Class<?>) DEFINE_CLASS.invoke(PRIVATE_LOOKUP_IN.invoke(null, declaringClass, LOOKUP.invoke(null)), (Object) bytes);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-}
diff --git a/entity-view/impl/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.EntityViewConfigurationProvider b/entity-view/impl/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.EntityViewConfigurationProvider
new file mode 100644
index 0000000000..c8b9de60bf
--- /dev/null
+++ b/entity-view/impl/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.EntityViewConfigurationProvider
@@ -0,0 +1 @@
+com.blazebit.persistence.view.impl.EntityViewConfigurationProviderImpl
diff --git a/entity-view/pom.xml b/entity-view/pom.xml
index ca0cc10171..45f9bb4405 100644
--- a/entity-view/pom.xml
+++ b/entity-view/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -24,50 +24,5 @@
         <module>impl</module>
         <module>processor</module>
         <module>testsuite</module>
-
-        <module>api-jar</module>
-        <module>impl-jar</module>
-
-        <module>api-jakarta</module>
-        <module>impl-jakarta</module>
-        <module>processor-jakarta</module>
     </modules>
-    <profiles>
-        <profile>
-            <id>jakarta</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>processor</module>
-                <module>testsuite</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-
-                <module>api-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>processor-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>processor</module>
-                <module>testsuite</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-
-                <module>api-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>processor-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/entity-view/processor-jakarta/pom.xml b/entity-view/processor-jakarta/pom.xml
deleted file mode 100644
index e4f36c3d32..0000000000
--- a/entity-view/processor-jakarta/pom.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view.processor</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-processor</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-entity-view-processor:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-processor:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-processor:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/processor/pom.xml b/entity-view/processor/pom.xml
index b9ac02394d..ada184fd76 100644
--- a/entity-view/processor/pom.xml
+++ b/entity-view/processor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -31,12 +31,10 @@
     <name>Blazebit Persistence Entity-View Annotation Processor</name>
 
     <properties>
-        <!-- We use Java 8 for tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
         <module.name>com.blazebit.persistence.view.processor</module.name>
         <com.jolira.hickory.version>1.0.0</com.jolira.hickory.version>
         <org.eclipse.tycho.compiler-jdt.version>0.26.0</org.eclipse.tycho.compiler-jdt.version>
+        <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</surefire.jvm.params>
     </properties>
 
     <dependencies>
@@ -52,16 +50,41 @@
             <version>0.18</version>
             <scope>test</scope>
         </dependency>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -76,95 +99,17 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive java.compiler;
-                                        requires transitive com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.view;
-                                        provides javax.annotation.processing.Processor with com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor;
-                                        provides com.blazebit.persistence.view.processor.convert.TypeConverter with com.blazebit.persistence.view.processor.convert.OptionalTypeConverter;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <useModulePath>false</useModulePath>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-        <id>post-10</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
-        <profile>
-            <id>post-10-unsafe-code-non-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <!-- When we use a Java 11+ JVM, we need a JDK 8, otherwise we can't compile the old unsafe code -->
-                                    <bootclasspath>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar${path.separator}${jdk8.home}${file.separator}lib${file.separator}tools.jar</bootclasspath>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>post-10-unsafe-code-mac</id>
-            <activation>
-                <jdk>[11,)</jdk>
-                <file>
-                    <exists>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}classes.jar</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <!-- When we use a Java 11+ JVM, we need a JDK 8, otherwise we can't compile the old unsafe code -->
-                                    <bootclasspath>${jdk8.home}${file.separator}jre${file.separator}lib${file.separator}rt.jar${path.separator}${jdk8.home}${file.separator}lib${file.separator}tools.jar</bootclasspath>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ClassWriter.java b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ClassWriter.java
index 305e5fe157..b45e1aed9c 100644
--- a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ClassWriter.java
+++ b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ClassWriter.java
@@ -135,9 +135,9 @@ public static String writeGeneratedAnnotation(ImportContext importContext, Conte
     public static void writeGeneratedAnnotation(StringBuilder generatedAnnotation, ImportContext importContext, Context context) {
         generatedAnnotation.append("@");
         if (importContext == null) {
-            generatedAnnotation.append(context.getGeneratedAnnotation().getQualifiedName().toString());
+            generatedAnnotation.append(context.getGeneratedAnnotation());
         } else {
-            generatedAnnotation.append(importContext.importType(context.getGeneratedAnnotation().getQualifiedName().toString()));
+            generatedAnnotation.append(importContext.importType(context.getGeneratedAnnotation()));
         }
         generatedAnnotation.append("(value = \"")
             .append(EntityViewAnnotationProcessor.class.getName());
diff --git a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Constants.java b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Constants.java
index 88dfcf9d90..8c5848bf4a 100644
--- a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Constants.java
+++ b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Constants.java
@@ -83,10 +83,10 @@ public final class Constants {
     public static final String METHOD_MAP_ATTRIBUTE = "com.blazebit.persistence.view.metamodel.MethodMapAttribute";
     public static final String METHOD_MULTI_MAP_ATTRIBUTE = "com.blazebit.persistence.view.metamodel.MethodMultiMapAttribute";
 
-    public static final String ENTITY = "javax.persistence.Entity";
-    public static final String ID = "javax.persistence.Id";
-    public static final String EMBEDDED_ID = "javax.persistence.EmbeddedId";
-    public static final String VERSION = "javax.persistence.Version";
+    public static final String ENTITY = "jakarta.persistence.Entity";
+    public static final String ID = "jakarta.persistence.Id";
+    public static final String EMBEDDED_ID = "jakarta.persistence.EmbeddedId";
+    public static final String VERSION = "jakarta.persistence.Version";
 
     public static final String CRITERIA_BUILDER = "com.blazebit.persistence.CriteriaBuilder";
     public static final String PAGINATED_CRITERIA_BUILDER = "com.blazebit.persistence.PaginatedCriteriaBuilder";
diff --git a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Context.java b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Context.java
index fa238feebf..64a7b11d38 100644
--- a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Context.java
+++ b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/Context.java
@@ -43,7 +43,7 @@ public class Context {
     private static final Object NULL_OBJECT = new Object();
     private final ProcessingEnvironment pe;
     private final boolean logDebug;
-    private final TypeElement generatedAnnotation;
+    private final String generatedAnnotation;
 
     private final Map<String, MetaEntityView> metaEntityViews = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, Boolean> generatedModelClasses = new ConcurrentHashMap<>();
@@ -73,13 +73,7 @@ public Context(ProcessingEnvironment pe) {
 
         Map<String, TypeMirror> optionalParameters = new HashMap<>();
         Map<String, Map<String, TypeConverter>> converters = new HashMap<>();
-        TypeElement java8AndBelowGeneratedAnnotation = pe.getElementUtils().getTypeElement("javax.annotation.Generated");
-        if (java8AndBelowGeneratedAnnotation != null) {
-            generatedAnnotation = java8AndBelowGeneratedAnnotation;
-        } else {
-            // Using the new name for this annotation in Java 9 and above
-            generatedAnnotation = pe.getElementUtils().getTypeElement("javax.annotation.processing.Generated");
-        }
+        generatedAnnotation = "javax.annotation.processing.Generated";
         for (TypeConverter typeConverter : ServiceLoader.load(TypeConverter.class, Context.class.getClassLoader())) {
             typeConverter.addRegistrations(converters);
         }
@@ -201,7 +195,7 @@ public boolean markGenerated(String name) {
         return generatedModelClasses.putIfAbsent(name, Boolean.TRUE) == null;
     }
 
-    public TypeElement getGeneratedAnnotation() {
+    public String getGeneratedAnnotation() {
         return generatedAnnotation;
     }
 
diff --git a/entity-view/processor/src/main/java/module-info.java b/entity-view/processor/src/main/java/module-info.java
new file mode 100644
index 0000000000..ff1c4c8f42
--- /dev/null
+++ b/entity-view/processor/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.view.processor {
+	requires transitive com.blazebit.persistence.core;
+	requires transitive com.blazebit.persistence.view;
+	requires static jdk.compiler;
+	provides javax.annotation.processing.Processor with com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor;
+	provides com.blazebit.persistence.view.processor.convert.TypeConverter with com.blazebit.persistence.view.processor.convert.OptionalTypeConverter;
+	uses com.blazebit.persistence.view.processor.convert.TypeConverter;
+}
\ No newline at end of file
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AEntity.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AEntity.java
index 33d708422c..8b82b81b1c 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AEntity.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AEntity.java
@@ -1,6 +1,6 @@
 package com.blazebit.persistence.view.processor.model;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class AEntity extends BaseEntity<Integer> {
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
index f64d88788d..6313873591 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticBuilder(AView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
index 0ae3ef519a..98e1805f80 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
@@ -11,7 +11,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticImplementation(AView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
index 37e4bf8dce..76a3325b4a 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticRelation(AView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
index 9c108038a9..4f21227057 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticRelation(AView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
index bf0204c718..e3640f21ad 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticMetamodel(AView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewBuilder.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewBuilder.java
index 85ac555171..64f8c54739 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewBuilder.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewBuilder.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticBuilder(BView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewImpl.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewImpl.java
index 7ff5f6380d..012f6ab8af 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewImpl.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewImpl.java
@@ -10,7 +10,7 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticImplementation(BView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
index db2b6d1b1e..f51cc432be 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
@@ -7,7 +7,7 @@
 import com.blazebit.persistence.view.metamodel.MethodPluralAttribute;
 import com.blazebit.persistence.view.metamodel.MethodSingularAttribute;
 import java.util.Collection;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticRelation(BView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
index 992c5126cb..034df4ef0e 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
@@ -6,7 +6,7 @@
 import com.blazebit.persistence.view.metamodel.AttributePathWrapper;
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
 import com.blazebit.persistence.view.metamodel.MethodSingularAttribute;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticRelation(BView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BView_.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BView_.java
index d43992982d..b2550c6811 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BView_.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BView_.java
@@ -7,7 +7,7 @@
 import com.blazebit.persistence.view.metamodel.AttributeFilterMapping;
 import com.blazebit.persistence.view.metamodel.MethodSingularAttribute;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 @Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 @StaticMetamodel(BView.class)
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/sub/BaseView_com_blazebit_persistence_view_processor_model_BView.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/sub/BaseView_com_blazebit_persistence_view_processor_model_BView.java
index 930f903be5..9eb1ee6de9 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/sub/BaseView_com_blazebit_persistence_view_processor_model_BView.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/sub/BaseView_com_blazebit_persistence_view_processor_model_BView.java
@@ -1,6 +1,6 @@
 package com.blazebit.persistence.view.processor.model.sub;
 
-@javax.annotation.Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
+@javax.annotation.processing.Generated(value = "com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor")
 public abstract class BaseView_com_blazebit_persistence_view_processor_model_BView<ID extends java.io.Serializable, X extends java.io.Serializable> extends com.blazebit.persistence.view.processor.model.BView<X> {
 
     public BaseView_com_blazebit_persistence_view_processor_model_BView() {
diff --git a/entity-view/processor/src/test/java/javax/annotation/Generated.java b/entity-view/processor/src/test/java/javax/annotation/Generated.java
deleted file mode 100644
index 2683c1ffa1..0000000000
--- a/entity-view/processor/src/test/java/javax/annotation/Generated.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package javax.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
-
-/**
- * We have this just to be able to test against all JDK versions.
- */
-@Documented
-@Retention(SOURCE)
-@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD,
-        LOCAL_VARIABLE, PARAMETER})
-public @interface Generated {
-    String[] value();
-    String date() default "";
-    String comments() default "";
-}
diff --git a/entity-view/testsuite-jakarta-runner/pom.xml b/entity-view/testsuite-jakarta-runner/pom.xml
deleted file mode 100644
index a0927a97f2..0000000000
--- a/entity-view/testsuite-jakarta-runner/pom.xml
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-testsuite-jakarta-runner</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view.testsuite.runner</module.name>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <jpa-api-version>${version.jakarta-jpa-api}</jpa-api-version>
-        <version.h2>${h2-2.version}</version.h2>
-        <testBasePackage>com.blazebit.persistence.view.testsuite</testBasePackage>
-        <surefireForkCount>2</surefireForkCount>
-        <test>EntityViewTestsuite*</test>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${jpa-api-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch</groupId>
-            <artifactId>junit-benchmarks</artifactId>
-            <version>0.7.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <skip>${maven.test.skip}</skip>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>${version.h2}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://${dbHost}:50000/test:progressiveStreaming=2;</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <jdbc.schema>entityview${surefire.forkNumber}</jdbc.schema>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>jcc</artifactId>
-                    <version>11.5.5.0</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
-                                <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>Oracle18</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <jdbc.schema>C##ENTITYVIEW${surefire.forkNumber}</jdbc.schema>
-                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
-                                <user.country>US</user.country>
-                                <user.language>en</user.language>
-                                <user.timezone>UTC</user.timezone>
-                                <!-- Dumb, dumber, Oracle -->
-                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
-                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ojdbc8</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
-                                <jdbc.user>sa</jdbc.user>
-                                <jdbc.password>Blaze-Persistence</jdbc.password>
-                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
-                                <jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                                <user.timezone>UTC</user.timezone>
-                            </systemPropertyVariables>
-                            <dependenciesToScan>
-                                <dependency>com.blazebit:blaze-persistence-entity-view-testsuite-jakarta</dependency>
-                            </dependenciesToScan>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.microsoft.sqlserver</groupId>
-                    <artifactId>mssql-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>hibernate-6.2</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/testsuite-jakarta/pom.xml b/entity-view/testsuite-jakarta/pom.xml
deleted file mode 100644
index a400042a3f..0000000000
--- a/entity-view/testsuite-jakarta/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-entity-view-testsuite-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.view.testsuite</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- If new integrations arrive, we can use profiles -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-
-        <!-- Add mockito early to the local maven repo since the Hibernate,DB2 build froze on downloading this dependency -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-entity-view-testsuite:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-testsuite:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-testsuite:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-entity-view-testsuite:jar}" regexp="\.jar$" replace="-tests.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-tests.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                    <classifier>tests</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                            <classifier>tests</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/entity-view/testsuite/pom.xml b/entity-view/testsuite/pom.xml
index 7893dfa208..39e50a6961 100644
--- a/entity-view/testsuite/pom.xml
+++ b/entity-view/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,28 +20,37 @@
     <name>Blazebit Persistence Entity-View Testsuite</name>
 
     <properties>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
         <module.name>com.blazebit.persistence.view.testsuite</module.name>
         <testBasePackage>com.blazebit.persistence.view.testsuite</testBasePackage>
         <surefireForkCount>2</surefireForkCount>
         <test>EntityViewTestsuite*</test>
+        <!-- Needed to assert ProxyFactory#close() is effective -->
+        <surefire.jvm.params.ProxyFactoryTest>
+            --add-opens com.blazebit.persistence.view.impl/com.blazebit.persistence.view.impl.proxy=com.blazebit.persistence.view.testsuite
+        </surefire.jvm.params.ProxyFactoryTest>
+        <!-- Needed to allow setting the "global" proxy factory into an existing EVM -->
+        <surefire.jvm.params.AbstractEntityViewTest>
+            --add-opens com.blazebit.persistence.view.impl/com.blazebit.persistence.view.impl=com.blazebit.persistence.view.testsuite
+        </surefire.jvm.params.AbstractEntityViewTest>
+
+        <surefire.jvm.params>
+            --add-opens java.base/java.lang=ALL-UNNAMED
+            ${surefire.jvm.params.ProxyFactoryTest}
+            ${surefire.jvm.params.AbstractEntityViewTest}
+        </surefire.jvm.params>
+        <useModulePath>true</useModulePath>
     </properties>
 
     <dependencies>
-
-        <!-- Test dependencies -->
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,19 +67,35 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -106,43 +131,10 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    open module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.core.parser;
-                                        requires com.blazebit.persistence.view;
-                                        requires com.blazebit.persistence.view.impl;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <!-- RDBMS profiles -->
         <profile>
@@ -159,6 +151,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:h2:mem:entityview${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
                                 <jdbc.user>admin</jdbc.user>
@@ -201,47 +194,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                                <forkCount>${surefireForkCount}</forkCount>
-                                <fork>$${surefire.forkNumber}</fork>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <forkCount>${surefireForkCount}</forkCount>
-                            <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
                                 <jdbc.user>root</jdbc.user>
@@ -283,6 +236,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
                                 <jdbc.user>postgres</jdbc.user>
@@ -313,42 +267,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>db2</id>
             <build>
@@ -360,6 +278,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:db2://${dbHost}:50000/test:progressiveStreaming=2;</jdbc.url>
                                 <jdbc.user>db2inst1</jdbc.user>
@@ -392,42 +311,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <test>${test}</test>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                                <testBasePackage>${testBasePackage}</testBasePackage>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>oracle</id>
             <build>
@@ -439,6 +322,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
@@ -487,6 +371,7 @@
                             <test>${test}</test>
                             <forkCount>${surefireForkCount}</forkCount>
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
+                            <useModulePath>${useModulePath}</useModulePath>
                             <systemPropertyVariables>
                                 <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
                                 <jdbc.user>sa</jdbc.user>
@@ -521,2156 +406,450 @@
 
         <!-- JPA provider profiles -->
         <profile>
-            <id>hibernate</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.2}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.2}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.2}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
+                    <version>${version.hibernate-6.2}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-4.3</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.4}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.0</id>
+            <id>hibernate-6.6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.6}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.6}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.6}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>eclipselink</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
+                <!-- Looks like EclipseLink isn't really made for running in module mode -->
+                <useModulePath>false</useModulePath>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>eclipselink</artifactId>
+                    <version>${version.eclipselink}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                    <version>${version.eclipselink}</version>
+                    <scope>provided</scope>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
+                <!-- We need the JTA API for updatable views -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <!-- We need the JTA API for updatable views -->
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/test/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/test/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>datanucleus-5.1</id>
+            <id>hibernate-apt</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
             <dependencies>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-test-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-test-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>test</scope>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-apt}</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
@@ -2683,81 +862,52 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-AstrictCascadingCheck=false</compilerArg>
+                                <compilerArg>-AdefaultVersionAttributeName=version</compilerArg>
+                                <compilerArg>-AdefaultVersionAttributeType=java.lang.Long</compilerArg>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/entity-view/testsuite/src/main/java/module-info.java b/entity-view/testsuite/src/main/java/module-info.java
new file mode 100644
index 0000000000..7a3528da31
--- /dev/null
+++ b/entity-view/testsuite/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+open module com.blazebit.persistence.view.testsuite {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.core;
+	requires com.blazebit.persistence.core.parser;
+	requires com.blazebit.persistence.view;
+	requires com.blazebit.persistence.view.impl;
+}
\ No newline at end of file
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java
index aa4def46f3..5852eda5cd 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java
@@ -5,13 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.array;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.EntityViewManager;
@@ -23,12 +25,7 @@
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static com.blazebit.persistence.view.testsuite.collections.subview.SubviewAssert.assertSubviewEquals;
 import static org.junit.Assert.assertEquals;
@@ -106,10 +103,8 @@ public void setUp() {
 
     // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
     @Test
-    @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoDB2.class, NoEclipselink.class })
     public void testArrayExpression() {
         EntityViewConfiguration cfg = EntityViews.createDefaultConfiguration();
         cfg.setProperty(ConfigurationProperties.PROXY_EAGER_LOADING, "true");
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/AbstractClassViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/AbstractClassViewTest.java
index 479533749e..92e7a7a34e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/AbstractClassViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/AbstractClassViewTest.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CovariantViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CovariantViewTest.java
index a76edf2c2a..ebfc3bd801 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CovariantViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CovariantViewTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java
index 329264821b..43c066ae9f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java
@@ -4,7 +4,6 @@
  */
 package com.blazebit.persistence.view.testsuite.basic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable;
 import com.blazebit.persistence.testsuite.treat.entity.SingleTableBase;
@@ -19,14 +18,11 @@
 import com.blazebit.persistence.view.testsuite.basic.model.SingleTableBaseAbstractEntityMappingValidationView;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  * @author Philipp Eder
  * @since 1.6.0
  */
-// NOTE: DataNucleus
-@Category({ NoDatanucleus.class })
 public class CreatableAbstractEntityTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java
index dbe6106803..0765dc849f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java
@@ -6,17 +6,13 @@
 package com.blazebit.persistence.view.testsuite.basic;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.EmbeddableTestEntityEmbeddableSubView;
 import com.blazebit.persistence.view.testsuite.basic.model.EmbeddableTestEntityIdView;
@@ -32,7 +28,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -48,9 +44,8 @@
  * @since 1.0.6
  */
 // NOTE: Only Hibernate supports this mapping
-//@Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class})
 // NOTE: Hibernate 6.3.1 bug
-@Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate60.class})
+@Category({ NoEclipselink.class, NoHibernate62.class})
 public class EmbeddableTestEntityViewTest extends AbstractEntityViewTest {
 
     protected EntityViewManager evm;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java
index 2279f36f38..36ef49dfca 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java
@@ -5,37 +5,31 @@
 
 package com.blazebit.persistence.view.testsuite.basic;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
+import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView1;
-import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView3;
 import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView2;
+import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView3;
 import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView1;
-import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView3;
 import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView2;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView3;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -139,8 +133,6 @@ public void work(EntityManager em) {
     }
 
     @Test
-    // NOTE: Datanucleus doesn't seem to support fetching non-root relations
-    @Category({ NoDatanucleus.class })
     public void entityViewFetchesInitializeEntitiesSimple() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class)
                 .where("id").eq(pers1.getId());
@@ -205,8 +197,7 @@ public void entityViewFetchesInitializeEntitiesSimple() {
 
     @Test
     // NOTE: EclipseLink messes up the whole query result as soon as map values are selected...
-    // NOTE: Datanucleus doesn't seem to support fetching non-root relations
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void entityViewFetchesInitializeEntities() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class)
             .where("id").eq(pers1.getId());
@@ -279,9 +270,7 @@ public void entityViewFetchesInitializeEntities() {
 
     @Test
     // NOTE: EclipseLink messes up the whole query result as soon as map values are selected...
-    // NOTE: Element collection fetching of non-roots only got fixed in Hibernate 5.2.3: https://hibernate.atlassian.net/browse/HHH-11140
-    // NOTE: Datanucleus doesn't seem to support fetching non-root relations
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void entityViewFetchesInitializeEntitiesWithElementCollections() {
         CriteriaBuilder<Person> criteria = cbf.create(em, Person.class)
                 .where("id").eq(pers1.getId());
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java
index 6286e8cbf8..9b77ef50a1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java
@@ -5,38 +5,32 @@
 
 package com.blazebit.persistence.view.testsuite.basic;
 
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PagedList;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.Sorters;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.CustomRootPersonView;
 import com.blazebit.persistence.view.testsuite.basic.model.DocumentWithEntityView;
 import com.blazebit.persistence.view.testsuite.basic.model.FilteredDocument;
 import com.blazebit.persistence.view.testsuite.basic.model.PersonView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  *
@@ -198,12 +192,8 @@ public void testEntityViewFetches() {
     }
 
     @Test
-    @Category({ NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
-    // We need a left entity join for this so Hibernate < 5.1 can't be used
-    // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
-    // Datanucleus fails because of a NPE?
-    // OpenJPA has no function support
+    @Category({ NoEclipselink.class })
     public void testEntityViewFetchesWithFilterAndSorter() {
         EntityViewManager evm = build(DocumentWithEntityView.class, PersonView.class);
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/InterfaceViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/InterfaceViewTest.java
index 7fc555f307..2a4b90f5c1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/InterfaceViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/InterfaceViewTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PolymorphicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PolymorphicTest.java
index e8bc04c433..b423f85638 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PolymorphicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PolymorphicTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java
index 5865735c44..1b0fc7fa41 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java
@@ -4,9 +4,14 @@
  */
 package com.blazebit.persistence.view.testsuite.basic;
 
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.PrimitiveDocument;
 import com.blazebit.persistence.testsuite.entity.PrimitivePerson;
@@ -14,23 +19,17 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.metamodel.ViewType;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveDocumentMultisetView;
 import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveDocumentView;
 import com.blazebit.persistence.view.testsuite.basic.model.PrimitivePersonView;
 import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveSimpleDocumentView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import jakarta.persistence.EntityManager;
 
-import javax.persistence.EntityManager;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 /**
  *
@@ -154,9 +153,8 @@ public void testEntityViewSubviewFetches() {
     }
 
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testEntityViewMultisetSubviewFetches() {
         EntityViewManager evm = build(
             PrimitiveSimpleDocumentView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cache/ViewTypeObjectBuilderTemplateCachingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cache/ViewTypeObjectBuilderTemplateCachingTest.java
index 557daa17bc..247c9988dc 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cache/ViewTypeObjectBuilderTemplateCachingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cache/ViewTypeObjectBuilderTemplateCachingTest.java
@@ -19,7 +19,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java
index 084035c8a9..4d7b25b434 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java
@@ -5,17 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.collections.basic;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -23,10 +16,10 @@
 import org.junit.runners.Parameterized;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentListMapSetView;
@@ -37,6 +30,9 @@
 import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentSetMapListView;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
+import jakarta.persistence.EntityManager;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -129,9 +125,8 @@ public static Collection<?> entityViewCombinations() {
     }
 
     @Test
-    // NOTE: DataNucleus renders joins wrong: https://github.com/datanucleus/datanucleus-rdbms/issues/177
     // Eclipselink has a result set mapping bug in case of map keys
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void testCollections() {
         EntityViewManager evm = build(viewType);
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java
index 1b1cad14f1..cb645d91b8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java
@@ -5,16 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.collections.embeddable.extended;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -22,12 +16,11 @@
 import org.junit.runners.Parameterized;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.embeddable.extended.model.ExtendedEmbeddableDocumentListMapSetView;
 import com.blazebit.persistence.view.testsuite.collections.embeddable.extended.model.ExtendedEmbeddableDocumentListSetMapView;
@@ -38,6 +31,9 @@
 import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.entity.extended.ExtendedDocumentForElementCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.extended.ExtendedPersonForElementCollections;
+import jakarta.persistence.EntityManager;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -129,8 +125,7 @@ public static Collection<?> entityViewCombinations() {
     }
 
     @Test
-    // TODO: report that datanucleus doesn't support element collection in an embeddable
-    @Category({NoHibernate.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({NoHibernate.class, NoEclipselink.class })
     // Eclipselink has a result set mapping bug in case of map keys
     public void testCollections() {
         EntityViewManager evm = build(viewType);
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java
index ce7df13296..5b47ef639c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java
@@ -5,16 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.collections.embeddable.simple;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -22,12 +16,11 @@
 import org.junit.runners.Parameterized;
 
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentListMapSetView;
@@ -38,6 +31,9 @@
 import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentSetMapListView;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForElementCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForElementCollections;
+import jakarta.persistence.EntityManager;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -129,7 +125,7 @@ public static Collection<?> entityViewCombinations() {
     }
 
     @Test
-    @Category({NoHibernate.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({NoHibernate.class, NoEclipselink.class })
     // Eclipselink has a result set mapping bug in case of map keys
     public void testCollections() {
         EntityViewManager evm = build(viewType);
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/DocumentExtensionForElementCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/DocumentExtensionForElementCollections.java
index f152e94cff..37d06e2f0c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/DocumentExtensionForElementCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/DocumentExtensionForElementCollections.java
@@ -9,11 +9,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForCollections.java
index 775da38bda..8374c0be62 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForCollections.java
@@ -13,15 +13,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForElementCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForElementCollections.java
index fa3304905e..fc1b72a8e4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForElementCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedDocumentForElementCollections.java
@@ -13,17 +13,17 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForCollections.java
index f09367d2ec..1e0ee74591 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForCollections.java
@@ -9,12 +9,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForElementCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForElementCollections.java
index 1fd7d03a8c..a9f90fa063 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForElementCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/extended/ExtendedPersonForElementCollections.java
@@ -7,11 +7,11 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForCollections.java
index d72d612aa0..4f7f5997a9 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForCollections.java
@@ -5,17 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.collections.entity.simple;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForElementCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForElementCollections.java
index ac1f782bd7..5cfb9f1b01 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForElementCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/DocumentForElementCollections.java
@@ -13,17 +13,17 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForCollections.java
index 00da855a7f..4fdd369256 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForCollections.java
@@ -9,15 +9,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForElementCollections.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForElementCollections.java
index 34db88c4e6..6260fee72e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForElementCollections.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/entity/simple/PersonForElementCollections.java
@@ -7,11 +7,11 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java
index 94d2d33ea4..d00b6da574 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java
@@ -5,10 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.collections.index;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Version;
@@ -26,14 +32,7 @@
 import com.blazebit.persistence.view.testsuite.collections.index.model.VersionKeyView;
 import com.blazebit.persistence.view.testsuite.collections.index.model.VersionStaticKeyView;
 import com.blazebit.persistence.view.testsuite.collections.index.model.VersionViewWithMappingIndex;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -81,7 +80,7 @@ public void testSelect() {
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSelectBatch2() {
         test(DocumentViewWithMappingIndexSelect.class, 2);
     }
@@ -92,9 +91,8 @@ public void testSubselect() {
     }
 
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testMultiset() {
         test(DocumentViewWithMappingIndexMultiset.class);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/multiple/SetAsListEntityViewTestTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/multiple/SetAsListEntityViewTestTest.java
index 9824f724f3..2eb488b99f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/multiple/SetAsListEntityViewTestTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/multiple/SetAsListEntityViewTestTest.java
@@ -18,7 +18,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/ordered/ViewSetAsListTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/ordered/ViewSetAsListTest.java
index 7ef35b1f6b..81b556efd2 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/ordered/ViewSetAsListTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/ordered/ViewSetAsListTest.java
@@ -12,7 +12,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Assert;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/singleton/SingletonCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/singleton/SingletonCollectionsTest.java
index e21c5a3bdf..c23c039377 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/singleton/SingletonCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/singleton/SingletonCollectionsTest.java
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java
index 00db60b108..2fe8a857bf 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java
@@ -5,35 +5,29 @@
 
 package com.blazebit.persistence.view.testsuite.collections.subview;
 
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
+import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps;
+import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps;
-import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentForEntityKeyMapsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForEntityKeyMapsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewSimpleDocumentForEntityKeyMapsView;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Map;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Moritz Becker
@@ -91,9 +85,6 @@ public void setUp() {
      * Test for https://github.com/Blazebit/blaze-persistence/issues/329
      */
     @Test
-    // NOTE: Hibernate 5.0 and lower don't work because of https://hibernate.atlassian.net/browse/HHH-10537 and https://hibernate.atlassian.net/browse/HHH-10577
-    // NOTE: DataNucleus does not support this yet: https://github.com/datanucleus/datanucleus-core/issues/182
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class })
     public void testCollections() {
         EntityViewManager evm = build(
                 SubviewDocumentForEntityKeyMapsView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java
index 1c0589e279..6e182fb5b7 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java
@@ -5,37 +5,32 @@
 
 package com.blazebit.persistence.view.testsuite.collections.subview;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.PersonForCollectionsMultisetFetchNestedView;
-import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentMultisetFetchView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsMultisetFetchView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewSimpleDocumentMultisetFetchView;
-import com.blazebit.persistence.view.testsuite.collections.subview.model.variations.PersonForCollectionsMasterView;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -102,9 +97,8 @@ public void setUp() {
 
     // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoDB2.class, NoEclipselink.class })
     public void testCollections() {
         EntityViewManager evm = build(
                 PersonForCollectionsMultisetFetchNestedView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedCollectionsTest.java
index 9b880699d0..f0c5c78db6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedCollectionsTest.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.PersonForCollectionsListNestedView;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedEmptyCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedEmptyCollectionsTest.java
index 906c2678c0..21df66da25 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedEmptyCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/NestedEmptyCollectionsTest.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.PersonForCollectionsListNestedView;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java
index 41c574f5b0..ab9706ae3e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java
@@ -5,13 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.collections.subview;
 
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
@@ -21,16 +25,8 @@
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsSelectFetchView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView;
 import com.blazebit.persistence.view.testsuite.collections.subview.model.variations.PersonForCollectionsMasterView;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
-import static com.blazebit.persistence.view.testsuite.collections.subview.SubviewAssert.assertSubviewEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -89,8 +85,6 @@ public void setUp() {
     }
 
     @Test
-    // NOTE: DataNucleus doesn't like CASE WHEN ... THEN '' ELSE NULL END because NULL apparently has a different type for DN..
-    @Category({ NoDatanucleus.class })
     public void testCollections() {
         EntityViewManager evm = build(
                 PersonForCollectionsSelectFetchNestedView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SimpleCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SimpleCollectionsTest.java
index 25e67e0000..27720e1862 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SimpleCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SimpleCollectionsTest.java
@@ -12,7 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SubviewClassCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SubviewClassCollectionsTest.java
index 0b9e9a92ea..0f106b3440 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SubviewClassCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SubviewClassCollectionsTest.java
@@ -12,7 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/type/TypeConverterTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/type/TypeConverterTest.java
index 3d43d6a1e2..88148cfb62 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/type/TypeConverterTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/type/TypeConverterTest.java
@@ -21,7 +21,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertEntityTest.java
index d5d4755225..f8f64f4583 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertEntityTest.java
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.*;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertViewTest.java
index f41d02c9b9..f93df77e8f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/convert/view/ConvertViewTest.java
@@ -31,7 +31,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.*;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/AbstractCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/AbstractCorrelationTest.java
index c4f0356148..df29b5fbd0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/AbstractCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/AbstractCorrelationTest.java
@@ -20,7 +20,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java
index 2ccf39724b..f4810c9b00 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java
@@ -5,11 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.batchsubselect;
 
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
@@ -24,13 +28,7 @@
 import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionElement;
 import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionEmbeddable;
 import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionId;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -38,7 +36,7 @@
  * @since 1.6.9
  */
 // NOTE: Requires values clause which currently is only available for Hibernate
-@Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class BatchSubselectSubsetCorrelationTest extends AbstractEntityViewTest {
     @Override
     protected Class<?>[] getEntityClasses() {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java
index 65cb5958de..03bf1446e2 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java
@@ -5,13 +5,11 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.embedded;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable;
@@ -23,14 +21,9 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.correlation.embedded.model.EmbeddableTestEntityCorrelationView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Christian Beikov
@@ -66,10 +59,9 @@ public void work(EntityManager em) {
     }
 
     @Test // For #556
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testEmbeddedCorrelation() {
         EntityViewManager evm = build(
                 EmbeddableTestEntityCorrelationView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java
index fb4ece12f1..78c02e5c84 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java
@@ -5,22 +5,20 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.embedding;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.ConfigurationProperties;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationView;
 import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationViewJoinId;
@@ -31,12 +29,7 @@
 import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationViewSubselectNormal;
 import com.blazebit.persistence.view.testsuite.correlation.embedding.model.SimpleDocumentEmbeddingCorrelatedView;
 import com.blazebit.persistence.view.testsuite.correlation.embedding.model.SimplePersonEmbeddingCorrelatedSubView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -48,57 +41,47 @@
 public class EmbeddingViewRootCorrelationTest extends AbstractEntityViewTest {
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationNormal() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, null);
     }
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationId() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, null);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize2() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 2);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize2() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 2);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize4() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 4);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize4() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 4);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize20() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 20);
     }
 
     @Test
-    // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize20() {
         testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 20);
     }
@@ -117,17 +100,15 @@ public void testSubselectCorrelationId() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationNormal() {
         testCorrelation(DocumentEmbeddingCorrelationViewJoinNormal.class, null);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationId() {
         testCorrelation(DocumentEmbeddingCorrelationViewJoinId.class, null);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java
index bdf57553b8..dac1850a7e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java
@@ -5,22 +5,18 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.expression;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PagedList;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.Sorters;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest;
 import com.blazebit.persistence.view.testsuite.correlation.expression.model.DocumentSimpleCorrelationViewJoinId;
 import com.blazebit.persistence.view.testsuite.correlation.expression.model.DocumentSimpleCorrelationViewSubqueryId;
@@ -28,8 +24,6 @@
 import com.blazebit.persistence.view.testsuite.correlation.model.SimpleDocumentCorrelatedView;
 import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView;
 import com.blazebit.persistence.view.testsuite.correlation.model.SimpleVersionCorrelatedView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 
@@ -41,56 +35,50 @@
 public class ExpressionCorrelationTest extends AbstractCorrelationTest {
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationId() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, null);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize2() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize4() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize20() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 20);
     }
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectCorrelationId() {
         testCorrelation(DocumentSimpleCorrelationViewSubselectId.class, null);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationId() {
         testCorrelation(DocumentSimpleCorrelationViewJoinId.class, null);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    //    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectCorrelationIdPaginated() {
         EntityViewManager evm = build(
                 DocumentSimpleCorrelationViewSubselectId.class,
@@ -111,11 +99,10 @@ public void testSubselectCorrelationIdPaginated() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testFilterSortJoinCorrelatedSingularViewPaginated() {
         EntityViewManager evm = buildEntityViewManagerForFilter();
 
@@ -133,11 +120,10 @@ public void testFilterSortJoinCorrelatedSingularViewPaginated() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testFilterSortJoinCorrelatedPluralViewPaginated() {
         EntityViewManager evm = buildEntityViewManagerForFilter();
 
@@ -155,11 +141,10 @@ public void testFilterSortJoinCorrelatedPluralViewPaginated() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testFilterSortJoinCorrelatedSingularBasicPaginated() {
         EntityViewManager evm = buildEntityViewManagerForFilter();
 
@@ -177,11 +162,10 @@ public void testFilterSortJoinCorrelatedSingularBasicPaginated() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testFilterSortJoinCorrelatedPluralBasicPaginated() {
         EntityViewManager evm = buildEntityViewManagerForFilter();
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java
index d481d16108..5d687322d1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java
@@ -5,13 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.general;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest;
 import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewJoinId;
 import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewJoinNormal;
@@ -19,8 +16,6 @@
 import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubqueryNormal;
 import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubselectId;
 import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubselectNormal;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  *
@@ -30,57 +25,53 @@
 public class GeneralCorrelationTest extends AbstractCorrelationTest {
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationNormal() {
         testCorrelation(DocumentCorrelationViewSubqueryNormal.class, null);
     }
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationId() {
         testCorrelation(DocumentCorrelationViewSubqueryId.class, null);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize2() {
         testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize2() {
         testCorrelation(DocumentCorrelationViewSubqueryId.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize4() {
         testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize4() {
         testCorrelation(DocumentCorrelationViewSubqueryId.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize20() {
         testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 20);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize20() {
         testCorrelation(DocumentCorrelationViewSubqueryId.class, 20);
     }
@@ -99,17 +90,15 @@ public void testSubselectCorrelationId() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationNormal() {
         testCorrelation(DocumentCorrelationViewJoinNormal.class, null);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationId() {
         testCorrelation(DocumentCorrelationViewJoinId.class, null);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java
index dc27f1800c..d5c21fc146 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java
@@ -5,23 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.joinable;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.correlation.joinable.model.DocumentJoinableCorrelationView;
 import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  *
@@ -31,10 +25,9 @@
 public class JoinableCorrelationTest extends AbstractEntityViewTest {
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinableCorrelation() {
         EntityViewManager evm = build(
                 DocumentJoinableCorrelationView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java
index 4f30b68607..cb11c9939c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java
@@ -5,25 +5,18 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.nestedjoin;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView;
 import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.DocumentNestedJoinView;
 import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.PersonNestedJoinSubView;
 import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.SimpleDocumentView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  *
@@ -32,11 +25,10 @@
  */
 public class JoinableCorrelationTest extends AbstractEntityViewTest {
 
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testNestedJoinCorrelation() {
         EntityViewManager evm = build(
                 DocumentNestedJoinView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java
index 9437d8c13b..99034e207f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java
@@ -5,13 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.correlation.simple;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest;
 import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewJoinId;
 import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewJoinNormal;
@@ -19,8 +16,6 @@
 import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubqueryNormal;
 import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubselectId;
 import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubselectNormal;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  *
@@ -30,57 +25,53 @@
 public class SimpleCorrelationTest extends AbstractCorrelationTest {
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationNormal() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, null);
     }
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryCorrelationId() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, null);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize2() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize2() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize4() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize4() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationNormalSize20() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 20);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize20() {
         testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 20);
     }
@@ -99,17 +90,15 @@ public void testSubselectCorrelationId() {
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationNormal() {
         testCorrelation(DocumentSimpleCorrelationViewJoinNormal.class, null);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinCorrelationId() {
         testCorrelation(DocumentSimpleCorrelationViewJoinId.class, null);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/subselectsubset/SubselectSubsetCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/subselectsubset/SubselectSubsetCorrelationTest.java
index e21d496348..11a2cd3c4f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/subselectsubset/SubselectSubsetCorrelationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/subselectsubset/SubselectSubsetCorrelationTest.java
@@ -8,12 +8,11 @@
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest;
 import com.blazebit.persistence.view.testsuite.correlation.subselectsubset.model.DocumentEmbeddingViewSubselectWithoutIdView;
 import com.blazebit.persistence.view.testsuite.correlation.subselectsubset.model.DocumentSubselectElementCollectionView;
@@ -34,6 +33,8 @@
 public class SubselectSubsetCorrelationTest extends AbstractCorrelationTest {
 
     @Test
+    // MySQL doesn't support limit in subquery of IN predicate
+    @Category({ NoMySQL.class })
     public void testSubselectSubsetCorrelation() {
         EntityViewManager evm = build(
                 PersonSubselectView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java
index 8e406fddc4..33367dd723 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java
@@ -7,13 +7,12 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.*;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.blazebit.persistence.CriteriaBuilder;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -22,9 +21,7 @@
 import com.blazebit.persistence.view.CTEProvider;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.cte.model.DocumentOwnersCTE;
 import com.blazebit.persistence.view.testsuite.cte.model.DocumentWithCTE;
@@ -32,9 +29,11 @@
 import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentFullAged;
 import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentFullAged.FullAgedCTEProvider;
 import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentUnderAged;
-import org.junit.experimental.categories.Category;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -42,8 +41,7 @@
  * @since 1.4.0
  */
 // NOTE: Uses CTEs and entity joins, so only works for a few combinations
-// NOTE: H2 before 1.4.199 does something weird again when join correlating a CTE..
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+@Category({ NoEclipselink.class })
 public class WithCTEMappingTest extends AbstractEntityViewTest {
 
     private Document doc1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/model/DocumentOwnersCTE.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/model/DocumentOwnersCTE.java
index b6412bc638..ab08489a8c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/model/DocumentOwnersCTE.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/model/DocumentOwnersCTE.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.view.testsuite.cte.model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import com.blazebit.persistence.CTE;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/custom/CustomClassViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/custom/CustomClassViewTest.java
index 3e38516a04..66778568b7 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/custom/CustomClassViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/custom/CustomClassViewTest.java
@@ -21,7 +21,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/embedded/AbstractEmbeddedMappingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/embedded/AbstractEmbeddedMappingTest.java
index 7d50402a0f..a41860e50f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/embedded/AbstractEmbeddedMappingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/embedded/AbstractEmbeddedMappingTest.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.testsuite.entity.Person;
 import org.junit.Before;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Christian Beikov
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntity2.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntity2.java
index beb0a92f30..9a55b66d28 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntity2.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntity2.java
@@ -13,15 +13,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "emb_tst_ent2")
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityEmbeddable2.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityEmbeddable2.java
index 7fe55cee59..9d2d02adb4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityEmbeddable2.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityEmbeddable2.java
@@ -13,15 +13,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
 
 @Embeddable
 public class EmbeddableTestEntityEmbeddable2 implements Serializable {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityId2.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityId2.java
index 4b113d0a28..c0adbc4aa8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityId2.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntityId2.java
@@ -9,11 +9,11 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 @Embeddable
 public class EmbeddableTestEntityId2 implements Serializable {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntitySimpleEmbeddable2.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntitySimpleEmbeddable2.java
index 9c555593e1..faaf53f7f4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntitySimpleEmbeddable2.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/EmbeddableTestEntitySimpleEmbeddable2.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class EmbeddableTestEntitySimpleEmbeddable2 implements Serializable {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrder.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrder.java
index e62534f355..b34787b253 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrder.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrder.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.testsuite.entity.LongSequenceEntity;
 
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPosition.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPosition.java
index 28a55e62aa..8687b11201 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPosition.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPosition.java
@@ -5,18 +5,18 @@
 
 package com.blazebit.persistence.view.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.HashSet;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefault.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefault.java
index f36fe93096..c5ac551d79 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefault.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefault.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefaultId.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefaultId.java
index 5beda05032..2b53f2222f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefaultId.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionDefaultId.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.view.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionElement.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionElement.java
index d725c63416..dcf3c2980b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionElement.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionElement.java
@@ -7,9 +7,9 @@
 
 import com.blazebit.persistence.testsuite.entity.LongSequenceEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionEmbeddable.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionEmbeddable.java
index 87cc8bdca2..ca29e6f22c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionEmbeddable.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionEmbeddable.java
@@ -6,8 +6,8 @@
 package com.blazebit.persistence.view.testsuite.entity;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class LegacyOrderPositionEmbeddable implements Serializable {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionId.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionId.java
index a871f29a81..7ae494a685 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionId.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/LegacyOrderPositionId.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.view.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/NamedEntity.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/NamedEntity.java
index 16ea4983ef..d4ecad20c9 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/NamedEntity.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/NamedEntity.java
@@ -7,10 +7,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Basic;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Basic;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/TestEntity.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/TestEntity.java
index 20a71fd49d..8eef0e7483 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/TestEntity.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/entity/TestEntity.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.entity;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java
index 6c9ed9a0d8..25ecfec2fb 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java
@@ -5,24 +5,24 @@
 
 package com.blazebit.persistence.view.testsuite.fetch.embedded;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.ConfigurationProperties;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.entity.EmbeddableTestEntity2;
 import com.blazebit.persistence.view.testsuite.entity.EmbeddableTestEntityEmbeddable2;
@@ -40,15 +40,7 @@
 import com.blazebit.persistence.view.testsuite.fetch.embedded.model.EmbeddableTestEntitySimpleFetchView;
 import com.blazebit.persistence.view.testsuite.fetch.embedded.model.IntIdEntityFetchSubView;
 import com.blazebit.persistence.view.testsuite.fetch.embedded.model.IntIdEntitySimpleSubView;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
 /**
  * Test for #601
@@ -60,7 +52,7 @@
 // NOTE: Element collection fetching of non-roots only got fixed in Hibernate 5.2.3: https://hibernate.atlassian.net/browse/HHH-11140
 //@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class })
 // NOTE: Hibernate 6.3.1 bug
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoHibernate60.class })
+@Category({ NoEclipselink.class, NoHibernate62.class })
 public class EmbeddedFetchTest extends AbstractEntityViewTest {
 
     protected EmbeddableTestEntity2 doc1;
@@ -148,91 +140,83 @@ public void setUp() {
     }
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryFetchEntity() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedEntitySize2() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedEntitySize4() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedEntitySize20() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 20);
     }
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectFetchEntity() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubselect.class);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinFetchEntity() {
         testCorrelation(EmbeddableTestEntityFetchAsEntityViewJoin.class);
     }
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryFetchView() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedViewSize2() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedViewSize4() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedViewSize20() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 20);
     }
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectFetchView() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewSubselect.class);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    //    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinFetchView() {
         testCorrelation(EmbeddableTestEntityFetchAsViewViewJoin.class);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java
index e99f51f275..fef4896555 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java
@@ -14,7 +14,6 @@
 import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.EntityManager;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -23,12 +22,7 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
@@ -37,6 +31,7 @@
 import com.blazebit.persistence.view.testsuite.fetch.multiset.model.PersonMultisetFetchView;
 import com.blazebit.persistence.view.testsuite.timeentity.DocumentForMultisetFetch;
 import com.blazebit.persistence.view.testsuite.timeentity.PersonForMultisetFetch;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -117,10 +112,8 @@ public void setUp() {
 
     // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
-    // NOTE: Java 8 time types are only supported as of Hibernate 5.2
     @Test
-    @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class })
+    @Category({ NoDB2.class, NoEclipselink.class })
     public void testCollections() {
         EntityViewManager evm = build(
                 PersonMultisetFetchView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/AbstractFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/AbstractFetchTest.java
index 22658128b5..a70f53148d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/AbstractFetchTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/AbstractFetchTest.java
@@ -20,7 +20,7 @@
 import com.blazebit.persistence.view.testsuite.fetch.normal.model.SimplePersonFetchSubView;
 import org.junit.Before;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.*;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java
index 5d66fc4124..e0f40b2a34 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java
@@ -5,19 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.fetch.normal.simple;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.view.testsuite.fetch.normal.AbstractFetchTest;
 import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewJoin;
 import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewSubquery;
 import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewSubselect;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  *
@@ -27,46 +22,42 @@
 public class SimpleFetchTest extends AbstractFetchTest {
 
     @Test
-    // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77
-    @Category({ NoDatanucleus.class })
     public void testSubqueryFetch() {
         testCorrelation(DocumentSimpleFetchViewSubquery.class);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize2() {
         testCorrelation(DocumentSimpleFetchViewSubquery.class, 2);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize4() {
         testCorrelation(DocumentSimpleFetchViewSubquery.class, 4);
     }
 
     @Test
     // NOTE: Requires values clause which currently is only available for Hibernate
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class})
+    @Category({ NoEclipselink.class})
     public void testSubqueryBatchedCorrelationIdSize20() {
         testCorrelation(DocumentSimpleFetchViewSubquery.class, 20);
     }
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectFetch() {
         testCorrelation(DocumentSimpleFetchViewSubselect.class);
     }
 
     @Test
-    // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
     // NOTE: Eclipselink renders a cross join at the wrong position in the SQL
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class })
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testJoinFetch() {
         testCorrelation(DocumentSimpleFetchViewJoin.class);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java
index 9f2af82484..c3902606ee 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java
@@ -5,28 +5,25 @@
 
 package com.blazebit.persistence.view.testsuite.fetch.subview;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.Sorters;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.fetch.subview.model.DocumentSelectSubviewTestView;
 import com.blazebit.persistence.view.testsuite.fetch.subview.model.DocumentSubselectSubviewTestView;
 import com.blazebit.persistence.view.testsuite.fetch.subview.model.PersonSelectSubview;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -70,7 +67,7 @@ public void setUp() {
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubqueryFetchOptional() {
         EntityViewManager evm = build(
                 DocumentSelectSubviewTestView.class,
@@ -87,7 +84,7 @@ public void testSubqueryFetchOptional() {
 
     @Test
     // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency
-    @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void testSubselectFetchWithSorter() {
         EntityViewManager evm = build(DocumentSubselectSubviewTestView.class);
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/basic/AttributeFilterTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/basic/AttributeFilterTest.java
index c1eed9958f..f676094b0b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/basic/AttributeFilterTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/basic/AttributeFilterTest.java
@@ -23,7 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java
index 5db8f14eed..fdee1ddafe 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java
@@ -5,26 +5,23 @@
 
 package com.blazebit.persistence.view.testsuite.filter.inheritance;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.entity.PrimitiveDocument;
 import com.blazebit.persistence.testsuite.entity.PrimitivePerson;
 import com.blazebit.persistence.testsuite.entity.PrimitiveVersion;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentView;
 import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentViewSub1;
 import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentViewSub2;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -82,8 +79,6 @@ public void setUp() {
     }
 
     @Test
-    // DataNucleus apparently thinks NULL has a specific type which isn't the one of other result arms of a CASE WHEN clause
-    @Category({ NoDatanucleus.class })
     public void testAttributeFilterWithInheritance() {
         EntityViewManager evm = build(
                 AttributeFilterInheritancePrimitiveDocumentView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/ConstructorOnlyFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/ConstructorOnlyFlatViewTest.java
index bac498c04f..81dfeee691 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/ConstructorOnlyFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/ConstructorOnlyFlatViewTest.java
@@ -18,7 +18,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewAsEmbeddedIdTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewAsEmbeddedIdTest.java
index 808f17a6c0..b43b3e9fdf 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewAsEmbeddedIdTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewAsEmbeddedIdTest.java
@@ -26,7 +26,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionRootTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionRootTest.java
index 1b0b56f60d..8fab8b7c49 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionRootTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionRootTest.java
@@ -16,7 +16,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionTest.java
index b64c686e5d..fd18ce7c79 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewCollectionTest.java
@@ -24,7 +24,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.*;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewPaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewPaginationTest.java
index 57fd39deec..5c66a4eb4b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewPaginationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewPaginationTest.java
@@ -25,7 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.*;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewTest.java
index d0fb1c2ff5..49fffb2824 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/FlatViewTest.java
@@ -23,7 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java
index ccbf7a2a30..b431151846 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java
@@ -5,7 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.flat;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -13,21 +18,16 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
 import com.blazebit.persistence.view.FetchStrategy;
 import com.blazebit.persistence.view.IdMapping;
 import com.blazebit.persistence.view.Mapping;
 import com.blazebit.persistence.view.UpdatableEntityView;
 import com.blazebit.persistence.view.UpdatableMapping;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.Map;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 /**
  *
@@ -91,9 +91,8 @@ public void querySubselect() {
     }
 
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void queryMultiset() {
         test(UpdatableDocumentWithMapsMultisetView.class);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java
index f756b5b671..ed1b296e61 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java
@@ -5,18 +5,24 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.basic;
 
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.Person;
+import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
-import com.blazebit.persistence.testsuite.entity.Version;
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.DocumentBaseView;
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.NewDocumentView;
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.NewSub1DocumentView;
@@ -27,18 +33,13 @@
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UnusedOldDocumentView;
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UsedOldDocumentView;
 import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UsedOldSub1DocumentView;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -212,8 +213,6 @@ public void inheritanceMetamodel() {
     }
 
     @Test
-    // TODO: report that datanucleus thinks a NULL literal is of type Integer and normal integral literals are of type Long
-    @Category({ NoDatanucleus.class })
     public void inheritanceQuery() {
         CriteriaBuilder<Document> criteria = cbf.create(em, Document.class, "d")
             .orderByAsc("id");
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/constructor/ConstructorInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/constructor/ConstructorInheritanceTest.java
index 2deae46f4f..3b6f9248a5 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/constructor/ConstructorInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/constructor/ConstructorInheritanceTest.java
@@ -25,7 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java
index d0c9473d67..5a48b30b2b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java
@@ -5,8 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.embedded;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable;
@@ -19,25 +24,17 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
 import com.blazebit.persistence.view.metamodel.SingularAttribute;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.IntIdEntityView;
 import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableDetailsView;
 import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableSub1DetailsView;
 import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableSub2DetailsView;
 import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -46,7 +43,7 @@
  * @since 1.2.0
  */
 // NOTE: Eclipselink and Datanucleus have no real support for subtype property access
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class EmbeddedInheritanceTest extends AbstractEntityViewTest {
 
     private SingleTableSub1 base1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java
index 23a6be01aa..fc4e62a9e4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java
@@ -5,8 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.nested;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable;
@@ -19,20 +24,13 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableBaseView;
 import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableChildView;
 import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableNormalView;
 import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableSub1View;
 import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableSub2View;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -42,7 +40,7 @@
  * @since 1.2.0
  */
 // NOTE: Eclipselink and Datanucleus have no real support for subtype property access
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class PolymorphicNestedInheritanceTest extends AbstractEntityViewTest {
 
     private SingleTableSub1 base1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java
index 86934d3aae..23143abc04 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java
@@ -5,17 +5,30 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.polymorphic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import com.blazebit.persistence.view.*;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.*;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.view.EntityView;
+import com.blazebit.persistence.view.EntityViewInheritance;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.EntityViewSetting;
+import com.blazebit.persistence.view.IdMapping;
+import com.blazebit.persistence.view.Mapping;
+import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,7 +37,7 @@
  * @author Jan-Willem Gmelig Meyling
  * @since 1.2.0
  */
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class InheritanceMappingInAnotherEntityViewTest extends AbstractEntityViewTest {
 
     private EntityViewManager evm;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java
index 0ba1bc6fca..ea86ed7150 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java
@@ -5,17 +5,27 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.polymorphic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import com.blazebit.persistence.view.*;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.*;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.view.EntityView;
+import com.blazebit.persistence.view.EntityViewInheritance;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.EntityViewSetting;
+import com.blazebit.persistence.view.IdMapping;
+import com.blazebit.persistence.view.Mapping;
+import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,7 +34,7 @@
  * @author Jan-Willem Gmelig Meyling
  * @since 1.2.0
  */
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class MultiLevelViewInheritanceTest extends AbstractEntityViewTest {
 
     private EntityViewManager evm;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java
index 961be0499c..bda508e400 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java
@@ -5,17 +5,30 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.polymorphic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.tx.TxVoidWork;
-import com.blazebit.persistence.view.*;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.*;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.tx.TxVoidWork;
+import com.blazebit.persistence.view.EntityView;
+import com.blazebit.persistence.view.EntityViewInheritance;
+import com.blazebit.persistence.view.EntityViewManager;
+import com.blazebit.persistence.view.EntityViewSetting;
+import com.blazebit.persistence.view.IdMapping;
+import com.blazebit.persistence.view.Mapping;
+import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,7 +37,7 @@
  * @author Jan-Willem Gmelig Meyling
  * @since 1.2.0
  */
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class NestedInheritanceMappingTest extends AbstractEntityViewTest {
 
     private EntityViewManager evm;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java
index 1d9b832746..1db9575dda 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java
@@ -5,8 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.polymorphic;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable;
@@ -19,9 +24,7 @@
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableBaseView;
 import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSimpleBaseView;
@@ -29,12 +32,7 @@
 import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSimpleSub2View;
 import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSub1View;
 import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSub2View;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -46,7 +44,7 @@
  * @since 1.2.0
  */
 // NOTE: Eclipselink and Datanucleus have no real support for subtype property access
-@Category({ NoEclipselink.class, NoDatanucleus.class })
+@Category({ NoEclipselink.class })
 public class PolymorphicInheritanceTest extends AbstractEntityViewTest {
 
     private SingleTableSub1 base1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java
index 1bc1358a82..83861de4be 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java
@@ -5,23 +5,22 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.subview.correlated;
 
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.DocumentView;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.DocumentView1;
@@ -41,13 +40,7 @@
 import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView2;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView3;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView4;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -122,22 +115,21 @@ public void setUp() {
     }
 
     @Test
-    // NOTE: Hibernate only supports entity joins from 5.1 onwards
     // NOTE: EclipseLink fails to handle the query because the ON clause contains function expressions CONCAT
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus4.class, NoMSSQL.class })
+    @Category({ NoEclipselink.class, NoMSSQL.class })
     public void inheritanceQueryJoined() {
         inheritanceQuery(DocumentView1.class, PersonBaseView1.class, OldPersonView1.class, YoungPersonView1.class);
     }
 
     @Test
     // NOTE: EclipseLink fails to handle the query because the ON clause contains function expressions CONCAT
-    @Category({ NoEclipselink.class, NoDatanucleus4.class, NoMSSQL.class })
+    @Category({ NoEclipselink.class, NoMSSQL.class })
     public void inheritanceQuerySubselect() {
         inheritanceQuery(DocumentView2.class, PersonBaseView2.class, OldPersonView2.class, YoungPersonView2.class);
     }
 
     @Test
-    @Category({ NoDatanucleus4.class, NoMSSQL.class })
+    @Category({ NoMSSQL.class })
     public void inheritanceQuerySelect() {
         inheritanceQuery(DocumentView3.class, PersonBaseView3.class, OldPersonView3.class, YoungPersonView3.class);
     }
@@ -145,7 +137,7 @@ public void inheritanceQuerySelect() {
     @Test
     // NOTE: This required the VALUES clause which is only supported for Hibernate for now
     // NOTE: For Oracle, we use to_clob in VALUES for cast_string which is problematic
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoMSSQL.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoMSSQL.class, NoOracle.class })
     public void inheritanceQuerySelectBatch() {
         inheritanceQuery(DocumentView4.class, PersonBaseView4.class, OldPersonView4.class, YoungPersonView4.class);
     }
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java
index 68a8685ef8..7a5de6c6b5 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java
@@ -5,17 +5,21 @@
 
 package com.blazebit.persistence.view.testsuite.inheritance.subview.simple;
 
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import com.blazebit.persistence.testsuite.entity.Document;
+import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import com.blazebit.persistence.testsuite.entity.Document;
-import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView1;
+import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView2;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView3;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.OldPersonView1;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.OldPersonView2;
@@ -26,17 +30,10 @@
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.PersonBaseView3;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.SimpleDocumentView;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.SimplePersonSubView;
-import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView2;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView1;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView2;
 import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView3;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -267,8 +264,6 @@ public void inheritanceQuerySubviewInheritanceMapping() {
     }
 
     @Test
-    // TODO: report that datanucleus thinks a NULL literal is of type Integer and normal integral literals are of type Long
-    @Category({ NoDatanucleus.class })
     public void inheritanceQuerySubviewInheritanceMappingWithoutBaseType() {
         this.evm = build(
                 DocumentView3.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java
index 9bec583aa3..4f4984ef04 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java
@@ -5,24 +5,19 @@
 
 package com.blazebit.persistence.view.testsuite.limit;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.limit.model.DocumentLimitView;
 import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitJoinExpressionView;
@@ -31,11 +26,7 @@
 import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitSelectView;
 import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitSubselectView;
 import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -69,41 +60,30 @@ public void work(EntityManager em) {
     }
 
     @Test
-//    @Category({ NoMySQLOld.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
-    // MySQL before 8 didn't support lateral joins which are required here
     // EclipseLink, Datanucleus and OpenJPA don't support extended SQL
     // NOTE: Hibernate 6.3 bug: https://hibernate.atlassian.net/browse/HHH-17386
-    @Category({ NoMySQLOld.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoHibernate60.class })
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testLimitMultiset() {
         test(PersonLimitMultisetView.class, null);
     }
 
     @Test
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
-    // We need a left entity join for this so Hibernate < 5.1 can't be used
-    // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
-    // Datanucleus fails because of a NPE?
-    // OpenJPA has no function support
+    @Category({ NoEclipselink.class })
     public void testLimitJoin() {
         test(PersonLimitJoinView.class, null);
     }
 
     @Test
-//    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
-    // We need a left entity join for this so Hibernate < 5.1 can't be used
-    // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
-    // Datanucleus fails because of a NPE?
-    // OpenJPA has no function support
     // NOTE: Hibernate 6.3 bug: https://hibernate.atlassian.net/browse/HHH-17386
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoHibernate60.class })
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testLimitJoinExpression() {
         test(PersonLimitJoinExpressionView.class, null);
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
     // Datanucleus fails because of a NPE?
     // OpenJPA has no function support
@@ -112,7 +92,7 @@ public void testLimitSelectBatch1() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
     // Datanucleus fails because of a NPE?
@@ -122,7 +102,7 @@ public void testLimitSelectBatch2() {
     }
 
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates
     // EclipseLink doesn't support subqueries in functions which is required for LIMIT
     // Datanucleus fails because of a NPE?
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java
index e40492395d..5b0e1a8bd7 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java
@@ -5,16 +5,26 @@
 
 package com.blazebit.persistence.view.testsuite.multiset;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestRule;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
@@ -30,19 +40,7 @@
 import com.blazebit.persistence.view.testsuite.multiset.model.multiset.SubviewPersonForCollectionsMultisetFetchViewMultiset;
 import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
 import com.carrotsearch.junitbenchmarks.BenchmarkRule;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestRule;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -146,9 +144,8 @@ public void setUp() {
 
     // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoDB2.class, NoEclipselink.class })
     @BenchmarkOptions(benchmarkRounds = 5, warmupRounds = 4)
     public void testJoinFetch() {
         testCollections(joinEvm, PersonForCollectionsMultisetFetchNestedViewJoin.class);
@@ -156,9 +153,8 @@ public void testJoinFetch() {
 
     // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation
     // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery
-    // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1
     @Test
-    @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoDB2.class, NoEclipselink.class })
     @BenchmarkOptions(benchmarkRounds = 5, warmupRounds = 4)
     public void testMultisetFetch() {
         testCollections(multisetEvm, PersonForCollectionsMultisetFetchNestedViewMultiset.class);
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java
index c6fc876636..3a52f0e2ab 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java
@@ -5,9 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.pagination;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -16,13 +20,7 @@
 import com.blazebit.persistence.view.Sorters;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.pagination.model.DocumentAggregationView;
-import com.blazebit.persistence.view.testsuite.pagination.model.DocumentViewInterface;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -31,8 +29,6 @@
  * @author Christian Beikov
  * @since 1.6.0
  */
-// NOTE: DataNucleus apparently only allows `MAX(fieldReference)` but we use `MAX(1)` for type resolving internally
-@Category({ NoDatanucleus.class })
 public class AggregateViewPaginationTest extends AbstractEntityViewTest {
 
     protected EntityViewManager evm;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/BasicViewPaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/BasicViewPaginationTest.java
index 122aa65c14..d7a9a625c0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/BasicViewPaginationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/BasicViewPaginationTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import org.junit.Before;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java
index 6f2c2cce68..22a663fa8a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java
@@ -5,10 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.pagination;
 
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -20,13 +25,7 @@
 import com.blazebit.persistence.view.Sorters;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.IdHolderView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-import java.util.Set;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -74,7 +73,7 @@ public void setUp() {
     private Document doc1;
     
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     // TODO: report eclipselink does not support subqueries in functions
     public void testPagination() {
         EntityViewSetting<DocumentViewInterface, PaginatedCriteriaBuilder<DocumentViewInterface>> settings = EntityViewSetting.create(DocumentViewInterface.class, 0, 1)
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java
index a0c87bef8a..4a15682a61 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java
@@ -5,24 +5,22 @@
 
 package com.blazebit.persistence.view.testsuite.predicated.basic;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections;
 import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections;
 import com.blazebit.persistence.view.testsuite.predicated.basic.model.BasicPredicatedDocumentCollectionsView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -106,9 +104,8 @@ public void setUp() {
     }
 
     @Test
-    // NOTE: DataNucleus renders joins wrong: https://github.com/datanucleus/datanucleus-rdbms/issues/177
     // Apparently EclipseLink just ignores any ON conditions when having join tables...
-    @Category({ NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class })
     public void multipleBasicPredicatedCollectionsAreFetchedCorrectly() {
         EntityViewManager evm = build(BasicPredicatedDocumentCollectionsView.class);
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java
index 71c01e5aec..7467410164 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java
@@ -5,7 +5,11 @@
 
 package com.blazebit.persistence.view.testsuite.proxy;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.Collections;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable;
@@ -14,9 +18,9 @@
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
+import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.ConfigurationProperties;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.basic.model.IntIdEntityView;
@@ -27,20 +31,18 @@
 import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableEmbeddableTestEntityNestedEmbeddableView;
 import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableEmbeddableTestEntityView;
 import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableNameObjectView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class ProxyFactoryEmeddableTest extends AbstractEntityViewTest {
 
     @Override
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryTest.java
index 741d16f558..4ad0bdeb37 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryTest.java
@@ -363,16 +363,7 @@ public void close() throws NoSuchFieldException, IllegalAccessException {
     }
 
     private void assertProxyEvmReferencesNull(Class<?> proxy) throws NoSuchFieldException, IllegalAccessException {
-        EntityViewManager proxyEvm = (EntityViewManager) proxy.getField(SerializableEntityViewManager.EVM_FIELD_NAME).get(null);
-        SerializableEntityViewManager serializableEvm =
-            (SerializableEntityViewManager) proxy.getField(
-                SerializableEntityViewManager.SERIALIZABLE_EVM_FIELD_NAME).get(null);
-        Field serializableEvmDelegateField = SerializableEntityViewManager.class.getDeclaredField(
-            SerializableEntityViewManager.SERIALIZABLE_EVM_DELEGATE_FIELD_NAME);
-        serializableEvmDelegateField.setAccessible(true);
-        EntityViewManager serializableEvmDelegate = (EntityViewManager) serializableEvmDelegateField.get(serializableEvm);
-        assertNull(proxyEvm);
-        assertNull(serializableEvmDelegate);
+        assertNull(proxy.getField(SerializableEntityViewManager.EVM_FIELD_NAME).get(null));
     }
 
     private <T> T getDeclaredFieldValue(Object obj, String fieldName, Class<T> resultType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subquery/MappingSubqueryTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subquery/MappingSubqueryTest.java
index 23df8c6b62..1a00ade1c6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subquery/MappingSubqueryTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subquery/MappingSubqueryTest.java
@@ -9,7 +9,9 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.testsuite.subquery.model.DocumentWithDeepSubqueryEmbeddingView;
@@ -161,6 +163,8 @@ public void testSubqueryEntityViewSettings() {
     }
 
     @Test
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoHibernate62.class })
     public void testSubqueryViewRootEntityViewSettings() {
         EntityViewManager evm = build(DocumentWithSubqueryViewRoot.class);
 
@@ -192,6 +196,8 @@ public void testSubqueryViewRootEntityViewSettings() {
     }
 
     @Test
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoHibernate62.class })
     public void testSubqueryEmbeddingViewEntityViewSettings() {
         EntityViewManager evm = build(
                 DocumentWithSubqueryEmbeddingView.class,
@@ -228,6 +234,8 @@ public void testSubqueryEmbeddingViewEntityViewSettings() {
     }
 
     @Test
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoHibernate62.class })
     public void testDeepSubqueryEmbeddingViewEntityViewSettings() {
         EntityViewManager evm = build(
                 DocumentWithDeepSubqueryEmbeddingView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/CollectionOverCommonRelationSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/CollectionOverCommonRelationSubviewTest.java
index b520008c7b..354f0d7ce9 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/CollectionOverCommonRelationSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/CollectionOverCommonRelationSubviewTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 import static org.junit.Assert.*;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java
index f63d055f1e..aca786a092 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java
@@ -5,35 +5,28 @@
 
 package com.blazebit.persistence.view.testsuite.subview;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.IdMapping;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKey;
-import javax.persistence.Table;
-import java.util.HashMap;
-import java.util.Map;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKey;
+import jakarta.persistence.Table;
 
 import static org.junit.Assert.assertEquals;
 
@@ -44,7 +37,7 @@
  * @author Moritz Becker
  * @since 1.4.0
  */
-@Category({NoDatanucleus.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoOracle.class, NoDB2.class})//Ignore DB2 until https://hibernate.atlassian.net/browse/HHH-15523 is fixed
+@Category({ NoEclipselink.class, NoOracle.class})
 public class MapKeySubviewTest extends AbstractEntityViewTest {
 
     private MapKeySubviewTest.MapContainer container;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/NullSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/NullSubviewTest.java
index 3f01e84c04..bba114e505 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/NullSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/NullSubviewTest.java
@@ -11,7 +11,7 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewEntityViewSettingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewEntityViewSettingTest.java
index 71eea6a6f7..99d5ce36c2 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewEntityViewSettingTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewEntityViewSettingTest.java
@@ -7,7 +7,8 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.EntityManager;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -79,8 +80,9 @@ public void work(EntityManager em) {
     }
 
     @Test
-    @Category({ NoEclipselink.class })
     // Eclipselink has a result set mapping bug in case of map keys
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testEntityViewSettingFilterSubview() {
         EntityViewManager evm = build(
                 DocumentMasterView.class,
@@ -111,8 +113,9 @@ public void testEntityViewSettingFilterSubview() {
     }
 
     @Test
-    @Category({ NoEclipselink.class })
     // Eclipselink does not support VALUE() dereferencing
+    // NOTE: Hibernate ORM 6.2 has an issue: https://hibernate.atlassian.net/browse/HHH-18272
+    @Category({ NoEclipselink.class, NoHibernate62.class })
     public void testEntityViewSettingFilterFilteredSubview() {
         EntityViewManager evm = build(
                 DocumentMasterView.class,
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewTest.java
index 5a6ddbfc38..7155d06b21 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/SubviewTest.java
@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/MissingItemsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/MissingItemsTest.java
index 540de4e5bb..1e545f0b61 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/MissingItemsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/MissingItemsTest.java
@@ -18,7 +18,7 @@
 import com.blazebit.persistence.view.testsuite.subview.multiplecollections.model.C;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 import java.util.Set;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/A.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/A.java
index e04607e980..75c0e828f0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/A.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/A.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.subview.multiplecollections.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/B.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/B.java
index 11b320c846..fbac13031a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/B.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/B.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.view.testsuite.subview.multiplecollections.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/C.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/C.java
index 1d57399204..f8845d4c1d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/C.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/multiplecollections/model/C.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.subview.multiplecollections.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/SubviewTreatTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/SubviewTreatTest.java
index 97aa8e5e1b..2f7b9dad6e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/SubviewTreatTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/SubviewTreatTest.java
@@ -14,7 +14,7 @@
 import com.blazebit.persistence.view.testsuite.subview.treat.model.ContainerItem1;
 import org.junit.Test;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/BaseContainerItem.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/BaseContainerItem.java
index 100219deea..be3669b16e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/BaseContainerItem.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/BaseContainerItem.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.subview.treat.model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.Table;
 
 /**
  * @author Moritz Becker
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/Container.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/Container.java
index 7945bf52d5..fda196452c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/Container.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/Container.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.view.testsuite.subview.treat.model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /**
  * @author Moritz Becker
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/ContainerItem1.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/ContainerItem1.java
index 9d88f82db4..8fbe5550ab 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/ContainerItem1.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/treat/model/ContainerItem1.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.subview.treat.model;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  * @author Moritz Becker
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/DocumentForMultisetFetch.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/DocumentForMultisetFetch.java
index 31474f70cb..fd0ce2713d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/DocumentForMultisetFetch.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/DocumentForMultisetFetch.java
@@ -22,17 +22,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/PersonForMultisetFetch.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/PersonForMultisetFetch.java
index c80e1e0122..c30ecb3984 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/PersonForMultisetFetch.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/timeentity/PersonForMultisetFetch.java
@@ -8,15 +8,15 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateDocumentTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateDocumentTest.java
index b667532244..105749aa0a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateDocumentTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateDocumentTest.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Date;
 
 /**
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
index a0e19f934e..b23f1e15e3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/AbstractEntityViewUpdateTest.java
@@ -23,8 +23,8 @@
 import org.junit.Assert;
 import org.junit.Before;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.Consumer;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java
index aaad185032..269946e142 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java
@@ -5,17 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.ArrayList;
+
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest;
 import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicWithCollectionsViewBase;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
 
 /**
  *
@@ -23,8 +23,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateBasicCollectionsTest<T extends UpdatableDocumentBasicWithCollectionsViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateBasicCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java
index e24f01e19d..e0dbabe56a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java
@@ -5,17 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.HashMap;
+
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest;
 import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicWithMapsViewBase;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.HashMap;
 
 /**
  *
@@ -23,8 +23,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateBasicMapsTest<T extends UpdatableDocumentBasicWithMapsViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateBasicMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java
index b68c297521..ee1a53f2b1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java
@@ -5,17 +5,17 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import java.util.Date;
+
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest;
 import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicViewBase;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Date;
 
 /**
  *
@@ -23,8 +23,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateBasicTest<T extends UpdatableDocumentBasicViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateBasicTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java
index 3b5c68b736..bc0a3c2f83 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableBasicCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java
index 37f6f99106..a4d8df42c0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableBasicMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java
index 74b4fddbaa..71cae629ff 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableBasicTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java
index a2e4fb810f..5af68f88d3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyBasicCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java
index 3b796cfe94..9b151a653b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyBasicMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java
index 4a0ee6d88d..68e6a364d8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyBasicTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java
index e51077edd9..ff2c10698f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java
@@ -5,8 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutable;
 
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -17,15 +24,10 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicCollectionsTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -33,8 +35,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableBasicCollectionsTest extends AbstractEntityViewUpdateBasicCollectionsTest<UpdatableDocumentBasicWithCollectionsView> {
 
     public EntityViewUpdateMutableBasicCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java
index 38facf6ca1..806ea34066 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java
@@ -5,8 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutable;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -17,16 +25,10 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicMapsTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -34,8 +36,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableBasicMapsTest extends AbstractEntityViewUpdateBasicMapsTest<UpdatableDocumentBasicWithMapsView> {
 
     public EntityViewUpdateMutableBasicMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java
index b11cfab17f..acc5bf924c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java
@@ -5,8 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutable;
 
+import java.util.Arrays;
+import java.util.Date;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -16,15 +23,11 @@
 import com.blazebit.persistence.view.spi.type.MutableStateTrackable;
 import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Date;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -32,8 +35,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableBasicTest extends AbstractEntityViewUpdateBasicTest<UpdatableDocumentBasicView> {
 
     public EntityViewUpdateMutableBasicTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java
index 961ff8d156..42fa80d74f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyBasicCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java
index 16c78f3d71..3a9293483d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyBasicMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java
index d158c54b26..5e390c443b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyBasicTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java
index 6006283e6b..c8cbbd22db 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyBasicCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java
index 5fa508cb0c..a67d98e99f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyBasicMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java
index 23a4b16769..27d8ddddc3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java
@@ -5,14 +5,12 @@
 
 package com.blazebit.persistence.view.testsuite.update.basic.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,8 +20,7 @@
  * @author Christian Beikov
  * @since 1.12.0
  */
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyBasicTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
index 1bc8877e3f..e3b7dcf3c6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java
@@ -5,11 +5,22 @@
 
 package com.blazebit.persistence.view.testsuite.update.converter;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.util.Date;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.entity.BlobEntity;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -18,19 +29,7 @@
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest;
 import com.blazebit.persistence.view.testsuite.update.converter.model.UpdatableBlobEntityView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import javax.persistence.EntityManager;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.sql.Blob;
-import java.sql.SQLException;
-import java.time.Instant;
-import java.util.Date;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -40,9 +39,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-// NOTE: Not sure why, but Hibernate 4.2 reports the LOB as being closed
-@Category({ NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateBlobTest extends AbstractEntityViewUpdateTest<UpdatableBlobEntityView> {
 
     private BlobEntity entity;
@@ -204,8 +201,7 @@ public void testSetBlob() throws Exception {
     @Test
     // Oracle keeps LOBs open/tied to a result set so we can't write to it by means of setBytes.
     // For Oracle it would be more appropriate to treat writes like "replacements" i.e. remember the written bytes and replace the underlying object on flush
-    // NOTE: No Datanucleus support yet
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOracle.class, NoH2.class})
+    @Category({ NoEclipselink.class, NoOracle.class, NoH2.class})
     public void testUpdateBlob() throws Exception {
         // Given
         {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java
index d7a5531e1f..de5e12f2ab 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java
index 9a3c83e0a6..22e891a13e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateCorrelatedCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java
index e275661b5f..93351ff56a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java
index 31ee06522f..14252b9f0f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateCorrelatedImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java
index ee523cfdfb..856554b30a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateCorrelatedMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java
index 0a5ed97424..4df86cb192 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateCorrelatedMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java
index 7872a0e1f2..59e0bee13e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java
index 1b0b9fb0c2..b1e94aa48e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateCorrelatedMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java
index 653ad928c0..d7b7bf7777 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java
index 461c54d770..5355cfef5d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.correlated.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -31,7 +30,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCorrelatedUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateCorrelatedUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java
index e1c56399e6..c6eabb7f45 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java
@@ -6,9 +6,7 @@
 package com.blazebit.persistence.view.testsuite.update.elementcollection;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
@@ -19,13 +17,13 @@
 import com.blazebit.persistence.view.testsuite.update.elementcollection.model.DocumentForElementCollectionsFlatViewElementsView;
 import com.blazebit.persistence.view.testsuite.update.elementcollection.model.DocumentForElementIdView;
 import com.blazebit.persistence.view.testsuite.update.elementcollection.model.PersonForElementCollectionsView;
-import org.junit.Assume;
+
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -39,7 +37,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No EclipseLink and Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class ElementCollectionUpdateReferenceTest extends AbstractEntityViewUpdateTest<DocumentForElementCollectionsEmbeddableElementsView> {
 
     private static final boolean REPLACE_WITH_REFERENCE_CONTENTS = true;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java
index 0703dbd508..06770b2917 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
@@ -25,7 +24,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateNestedEmbeddableCollectionsTest<T extends UpdatableEmbeddableEntityWithCollectionsViewBase> extends AbstractEntityViewUpdateNestedEmbeddableEntityTest<T> {
 
     public AbstractEntityViewUpdateNestedEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableEntityTest.java
index bc2765beff..282b5a755f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableEntityTest.java
@@ -20,7 +20,7 @@
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleIntIdEntityView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleNameObjectView;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java
index c58b585c43..fc26df4b09 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java
@@ -5,12 +5,9 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
-import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleEmbeddableEntityView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleIntIdEntityView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleNameObjectView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.UpdatableEmbeddableEntityWithMapsEmbeddableViewBase;
@@ -28,7 +25,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateNestedEmbeddableMapsTest<T extends UpdatableEmbeddableEntityWithMapsViewBase> extends AbstractEntityViewUpdateNestedEmbeddableEntityTest<T> {
 
     public AbstractEntityViewUpdateNestedEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java
index b10be1b606..877f1f146d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
@@ -24,7 +23,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateNestedEmbeddableTest<T extends UpdatableEmbeddableEntityViewBase> extends AbstractEntityViewUpdateNestedEmbeddableEntityTest<T> {
 
     public AbstractEntityViewUpdateNestedEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java
index b891d05525..d14e948bfd 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java
@@ -5,23 +5,18 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableEntityTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph.model.UpdatableEmbeddableEntityWithCollectionsView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph.model.UpdatableEmbeddableEntityWithMultipleCollectionsEmbeddableViewBase;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -29,8 +24,7 @@
  * @since 1.3.0
  */
 // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedEmbeddableCollectionsGraphTest extends AbstractEntityViewUpdateNestedEmbeddableEntityTest<UpdatableEmbeddableEntityWithCollectionsView> {
 
     public EntityViewUpdateNestedEmbeddableCollectionsGraphTest() {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java
index 998aedc0cd..abb7a2f64c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java
@@ -5,13 +5,19 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
@@ -21,18 +27,11 @@
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableCollectionsTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleEmbeddableEntityView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable.model.UpdatableEmbeddableEntityWithCollectionsView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -41,8 +40,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateMutableNestedEmbeddableCollectionsTest extends AbstractEntityViewUpdateNestedEmbeddableCollectionsTest<UpdatableEmbeddableEntityWithCollectionsView> {
 
     public EntityViewUpdateMutableNestedEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java
index 169428ae9e..99f0ce2ad4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java
@@ -5,41 +5,30 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
-import com.blazebit.persistence.view.change.ChangeModel;
-import com.blazebit.persistence.view.change.MapChangeModel;
-import com.blazebit.persistence.view.change.SingularChangeModel;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableMapsTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleIntIdEntityView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleNameObjectView;
 import com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable.model.UpdatableEmbeddableEntityWithMapsView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -48,10 +37,8 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-// NOTE: No Datanucleus support yet
-//@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class})
 // NOTE: Hibernate 6 bug: https://hibernate.atlassian.net/browse/HHH-17383
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate60.class})
+@Category({ NoEclipselink.class, NoHibernate62.class})
 public class EntityViewUpdateMutableNestedEmbeddableMapsTest extends AbstractEntityViewUpdateNestedEmbeddableMapsTest<UpdatableEmbeddableEntityWithMapsView> {
 
     public EntityViewUpdateMutableNestedEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java
index d8fc531df9..4416406a19 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.view.FlushMode;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableNestedEmbeddableTest extends AbstractEntityViewUpdateNestedEmbeddableTest<UpdatableEmbeddableEntityView> {
 
     public EntityViewUpdateMutableNestedEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java
index 60e21a0313..8635c7f569 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
@@ -25,7 +24,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateEmbeddableCollectionsTest<T extends UpdatableDocumentEmbeddableWithCollectionsViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java
index ebe8ff9edd..daa2a36dcb 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
@@ -25,7 +24,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateEmbeddableMapsTest<T extends UpdatableDocumentEmbeddableWithMapsViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java
index 45464b2628..73d9627092 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
@@ -23,7 +22,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractEntityViewUpdateEmbeddableTest<T extends UpdatableDocumentEmbeddableViewBase> extends AbstractEntityViewUpdateDocumentTest<T> {
 
     public AbstractEntityViewUpdateEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version, Class<T> viewType) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java
index 38129a79ec..4646b7ce4d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableWithCollectionsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEmbeddableCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java
index 6a9464e67a..50147fec8c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableWithMapsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEmbeddableMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java
index 15ab66fa99..ca52e0ca88 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEmbeddableTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java
index 4b1111ce71..19c7b4719f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableWithCollectionsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java
index af3c34bfbd..d4ef971ff3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableWithMapsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEmbeddableMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java
index c03fab627c..da9a9b1d35 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEmbeddableTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java
index 3667285806..979ac7fbd4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java
@@ -5,13 +5,15 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable;
 
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
@@ -19,18 +21,15 @@
 import com.blazebit.persistence.view.change.ChangeModel;
 import com.blazebit.persistence.view.change.PluralChangeModel;
 import com.blazebit.persistence.view.change.SingularChangeModel;
-import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
+import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.AbstractEntityViewUpdateEmbeddableCollectionsTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable.model.UpdatableDocumentEmbeddableWithCollectionsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -39,8 +38,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateMutableEmbeddableCollectionsTest extends AbstractEntityViewUpdateEmbeddableCollectionsTest<UpdatableDocumentEmbeddableWithCollectionsView> {
 
     private boolean registerType;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java
index a3c9868df2..41c9723ecd 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java
@@ -5,13 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable;
 
+import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.FlushMode;
@@ -19,20 +22,15 @@
 import com.blazebit.persistence.view.change.ChangeModel;
 import com.blazebit.persistence.view.change.MapChangeModel;
 import com.blazebit.persistence.view.change.SingularChangeModel;
-import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
+import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.AbstractEntityViewUpdateEmbeddableMapsTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable.model.UpdatableDocumentEmbeddableWithMapsView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -41,8 +39,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateMutableEmbeddableMapsTest extends AbstractEntityViewUpdateEmbeddableMapsTest<UpdatableDocumentEmbeddableWithMapsView> {
 
     private boolean registerType;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java
index 25bf6ae997..e102da42b9 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableEmbeddableTest extends AbstractEntityViewUpdateEmbeddableTest<UpdatableDocumentEmbeddableView> {
 
     private final boolean registerType;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java
index 1d03dc3344..313a6a77f1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableWithCollectionsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java
index a823444472..091f01f7b5 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableWithMapsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEmbeddableMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java
index cd372c238f..0c4e91e0c7 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEmbeddableTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java
index f9341e6557..10527c8b11 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java
@@ -5,16 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.negative;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.IdMapping;
 import com.blazebit.persistence.view.UpdatableEntityView;
 import com.blazebit.persistence.view.MappingInverse;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -30,7 +27,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateInverseMappingEmbeddableCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java
index 46e119bf6d..b9be78a793 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableWithCollectionsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java
index 566c95db5d..3a5f8e1813 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableWithMapsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEmbeddableMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java
index 35a18a67d4..2113cb99db 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEmbeddableTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java
index 80837ac2a7..7f1b1afbbe 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -31,7 +30,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest<UpdatableDocumentEntityWithCollectionsView> {
 
     public EntityViewUpdateCreatableEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java
index e2b8cb6122..2b2fa96750 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest<UpdatableDocumentEntityWithMapsView> {
 
     public EntityViewUpdateCreatableEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java
index 901af56bcd..91164e35fb 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableEntityTest extends AbstractEntityViewUpdateEntityTest<UpdatableDocumentEntityView> {
 
     public EntityViewUpdateCreatableEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java
index 9cb0d5e29a..b87b5e2450 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.entity.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityWithCollectionsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEntityCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java
index 9da8f0f9f6..8fa86efe0a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.entity.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityWithMapsView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEntityMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java
index 12524dd661..a873c3f902 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.entity.creatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityView;
 import org.junit.Test;
@@ -23,7 +20,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateCreatableOnlyEntityTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java
index 4dec1af300..c9e471d684 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -31,7 +30,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest<UpdatableDocumentEntityWithCollectionsView> {
 
     public EntityViewUpdateMutableEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java
index 30901e5b24..5b72ebaeef 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest<UpdatableDocumentEntityWithMapsView> {
 
     public EntityViewUpdateMutableEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java
index a47617a4f3..7876495fab 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableEntityTest extends AbstractEntityViewUpdateEntityTest<UpdatableDocumentEntityView> {
 
     public EntityViewUpdateMutableEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java
index a3caacd848..e2f303f581 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest<UpdatableDocumentEntityWithCollectionsView> {
 
     public EntityViewUpdateMutableOnlyEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java
index 777998ce80..7cb520ea9d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest<UpdatableDocumentEntityWithMapsView> {
 
     public EntityViewUpdateMutableOnlyEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java
index 5985ad8bfc..031377cfeb 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateMutableOnlyEntityTest extends AbstractEntityViewUpdateEntityTest<UpdatableDocumentEntityView> {
 
     public EntityViewUpdateMutableOnlyEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java
index 7b7855f89c..463ff887f4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -19,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import static org.junit.Assert.*;
 
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest<UpdatableDocumentEntityWithCollectionsView> {
 
     public EntityViewUpdateUpdatableOnlyEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java
index ee20e8f27a..709077be8a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -19,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import static org.junit.Assert.*;
 
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest<UpdatableDocumentEntityWithMapsView> {
 
     public EntityViewUpdateUpdatableOnlyEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java
index 60c9458051..5081c66eb9 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.entity.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -18,7 +17,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import static org.junit.Assert.*;
 
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateUpdatableOnlyEntityTest extends AbstractEntityViewUpdateEntityTest<UpdatableDocumentEntityView> {
 
     public EntityViewUpdateUpdatableOnlyEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java
index 161cfdd5c7..4d4ac4b931 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java
@@ -5,11 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable;
 
+import java.util.Collection;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObjectContainer;
 import com.blazebit.persistence.view.FlushMode;
@@ -19,15 +24,10 @@
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableDocumentWithCollectionsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectContainerView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  *
@@ -35,9 +35,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-// NOTE: Hibernate 4 does not support a list of embeddables containing embeddables
-@Category({NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedMutableFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedMutableFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java
index 507d79f5b0..e4c1795d0b 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java
@@ -5,11 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable;
 
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObjectContainer;
 import com.blazebit.persistence.view.FlushMode;
@@ -19,15 +24,10 @@
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableDocumentWithMapsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectContainerView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  *
@@ -35,9 +35,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-// NOTE: Hibernate 4 does not support a list of embeddables containing embeddables
-@Category({NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedMutableFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedMutableFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java
index b18769312e..26bdfa50ac 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableFlatViewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedMutableFlatViewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java
index fcec331eb8..25975ac495 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java
@@ -5,18 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentWithCollectionsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -26,9 +22,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java
index c61f654dcc..cf0dc52063 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java
@@ -5,18 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentWithMapsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -26,9 +22,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java
index 55d6cc0cce..8b8e2a2919 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java
@@ -5,18 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView;
 import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -26,9 +22,7 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables
-// NOTE: No Datanucleus support yet
-@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedUpdatableOnlyFlatViewTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java
index 9cad3ad746..bab52ec003 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
@@ -38,7 +37,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleMutableFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java
index 8eefc8054e..b23e8a31c8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleMutableFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java
index 7b7c3169db..dde62603cd 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
@@ -26,7 +25,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableFlatViewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     private Integer i1Id;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java
index 3d3b70007c..6085299233 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java
index d2028808c0..ad6310bb08 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java
index 334f7ee038..5f66a1b1f7 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubtypeFlatViewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleMutableSubtypeFlatViewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java
index 6c9f45e731..0caeb37e21 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentWithCollectionsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView;
@@ -24,7 +21,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java
index 8b47202e64..013f5dde2a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentWithMapsView;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView;
@@ -24,7 +21,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java
index 573c58bd68..b1e4fc110d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java
@@ -5,10 +5,7 @@
 
 package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentView;
 import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView;
@@ -24,7 +21,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlyFlatViewTest extends AbstractEntityViewTest {
 
     @Test
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java
index fafe4e9f62..5a991b0045 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.listener;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.FlushMode;
@@ -37,7 +36,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateListenerCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateListenerCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java
index 29d516d77b..3e78daa189 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.listener;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.FlushMode;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateListenerMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateListenerMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java
index a1357eac88..498fe0a30f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.listener;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.EntityViewManager;
@@ -23,7 +22,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import java.util.Date;
 
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateListenerTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     private static Date POST_UPDATE_DATE = new Date(0);
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java
index ff26ddb891..8a3428b831 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.metamodel;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.NameObject;
@@ -32,7 +31,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewMetamodelFlatViewTest extends AbstractEntityViewTest {
 
     private final EntityViewConfiguration entityViewConfiguration;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java
index 0778f0f15b..cb2fcc79d5 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.metamodel;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -30,7 +29,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 import java.util.Set;
 
@@ -42,7 +41,7 @@
  * @since 1.2.0
  */
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewMetamodelTest extends AbstractEntityViewTest {
 
     private final EntityViewConfiguration entityViewConfiguration;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java
index 977e08f2fc..7cd01333bf 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.view.testsuite.update.natural;
 
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity;
@@ -23,7 +22,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public abstract class AbstractBookEntityViewTest<T> extends AbstractEntityViewUpdateTest<T> {
 
     protected NaturalIdJoinTableEntity e1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
index a687ababcf..bac096cdae 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.natural;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewCollectionsTest extends AbstractBookEntityViewTest<UpdatableNaturalJoinTableEntityWithCollectionsView> {
 
     public EntityViewUpdateSimpleImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java
index 52af717e0f..ff8fc2b39c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java
@@ -8,7 +8,6 @@
 import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity;
@@ -38,7 +37,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest extends AbstractBookEntityViewTest<UpdatableNaturalJoinTableEntityWithIdViewCollectionsView> {
 
     public EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
index a0919ce51a..3df286a7b6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.natural;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewMapsTest extends AbstractBookEntityViewTest<UpdatableNaturalJoinTableEntityWithMapsView> {
 
     public EntityViewUpdateSimpleImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java
index dab6ef3f0a..65303ec7e0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.natural;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewTest extends AbstractBookEntityViewTest<UpdatableBookReferenceView> {
 
     public EntityViewUpdateSimpleImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java
index 940c2c451b..ae1e625dbe 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java
@@ -6,19 +6,16 @@
 package com.blazebit.persistence.view.testsuite.update.natural;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.testsuite.update.natural.model.BookIdView;
-import com.blazebit.persistence.view.testsuite.update.natural.model.BookIsbnView;
 import com.blazebit.persistence.view.testsuite.update.natural.model.BookIsbnWithPkView;
 import com.blazebit.persistence.view.testsuite.update.natural.model.BookPkWithIsbnView;
 import com.blazebit.persistence.view.testsuite.update.natural.model.UpdatableBookReferencePkView;
-import com.blazebit.persistence.view.testsuite.update.natural.model.UpdatableBookReferenceView;
+
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -33,7 +30,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewWithPkIdTest extends AbstractBookEntityViewTest<UpdatableBookReferencePkView> {
 
     public EntityViewUpdateSimpleImmutableSubviewWithPkIdTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/AbstractEntityViewRemoveDocumentTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/AbstractEntityViewRemoveDocumentTest.java
index 6bde127b7c..8160a3e061 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/AbstractEntityViewRemoveDocumentTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/AbstractEntityViewRemoveDocumentTest.java
@@ -17,7 +17,7 @@
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -205,6 +205,9 @@ protected AssertStatementBuilder deleteDocumentOwned(AssertStatementBuilder buil
                     .assertDelete().forRelation(Document.class, "peopleListBag").and()
                     .assertDelete().forRelation(Document.class, "peopleCollectionBag").and();
         }
+        if (isQueryStrategy() && !simpleDelete && dbmsDialect.supportsModificationQueryInWithClause()) {
+            return builder;
+        }
         if (supportsNestedEmbeddables()) {
             builder
                     .assertDelete().forRelation(Document.class, "nameContainerMap").and()
@@ -228,7 +231,9 @@ protected AssertStatementBuilder deletePersonOwned(AssertStatementBuilder builde
                     .assertDelete().forRelation(Person.class, "favoriteDocuments").and()
             ;
         }
-
+        if (isQueryStrategy() && !simpleDelete && dbmsDialect.supportsModificationQueryInWithClause()) {
+            return builder;
+        }
         return builder
                 .assertDelete().forRelation(Person.class, "localized").and()
                 ;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java
index 4dcebbd414..30b3962967 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java
@@ -7,7 +7,6 @@
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertSelectStatementBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewRemoveNestedSubviewCollectionsTest extends AbstractEntityViewRemoveDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewRemoveNestedSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java
index 60ba7af0d0..92c8faf202 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java
@@ -7,7 +7,6 @@
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertSelectStatementBuilder;
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewRemoveNestedSubviewMapsTest extends AbstractEntityViewRemoveDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewRemoveNestedSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java
index 42d83ea9c2..6009fec628 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.remove.cascade.nested;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewRemoveNestedSubviewTest extends AbstractEntityViewRemoveDocumentTest<UpdatableDocumentView> {
 
     public EntityViewRemoveNestedSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java
index 92a717574b..023d7bbae6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.remove.cascade.simple;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.PrimitiveDocument;
 import com.blazebit.persistence.testsuite.entity.PrimitiveFamily;
@@ -30,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -39,7 +38,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewRemoveCascadeOneToManyTest extends AbstractEntityViewUpdateTest<PersonIdView> {
 
     private PrimitiveFamily family;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/AbstractEntityViewOrphanRemoveDocumentTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/AbstractEntityViewOrphanRemoveDocumentTest.java
index 3529641999..436862e6d3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/AbstractEntityViewOrphanRemoveDocumentTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/AbstractEntityViewOrphanRemoveDocumentTest.java
@@ -17,7 +17,7 @@
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java
index 0cfb7d3695..3429e16144 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewOrphanRemoveNestedSubviewCollectionsTest extends AbstractEntityViewOrphanRemoveDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewOrphanRemoveNestedSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java
index a8c8342684..8674b36d3d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewOrphanRemoveNestedSubviewMapsTest extends AbstractEntityViewOrphanRemoveDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewOrphanRemoveNestedSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java
index 21cd4a4d00..fe3f7c974a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewOrphanRemoveNestedSubviewTest extends AbstractEntityViewOrphanRemoveDocumentTest<UpdatableDocumentView> {
 
     public EntityViewOrphanRemoveNestedSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java
index 929438b39b..9734edddc0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.rollback;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -29,7 +28,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateRollbackCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentRollbackWithCollectionsView> {
 
     public EntityViewUpdateRollbackCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java
index 4090fa43e5..6a74b0db11 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.rollback;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -25,8 +24,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -39,7 +38,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateRollbackTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentRollbackView> {
 
     public EntityViewUpdateRollbackTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java
index b24b285374..98acad93e1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java
@@ -5,25 +5,24 @@
 
 package com.blazebit.persistence.view.testsuite.update.singular;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
 import com.blazebit.persistence.testsuite.entity.SingularListEntity;
 import com.blazebit.persistence.view.FlushMode;
 import com.blazebit.persistence.view.FlushStrategy;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest;
 import com.blazebit.persistence.view.testsuite.update.singular.model.SingularListEntityView;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,9 +32,7 @@
  * @since 1.6.8
  */
 @RunWith(Parameterized.class)
-// NOTE: Hibernate 4.2 doesn't support attribute converters
-// NOTE: No EclipseLink and Datanucleus support yet
-@Category({ NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class SingularListUpdateTest extends AbstractEntityViewUpdateTest<SingularListEntityView> {
 
     private SingularListEntity entity1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java
index 0db9b12bb7..a9b7dfa53d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.graph;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -28,7 +27,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Collection;
 
 import static org.junit.Assert.*;
@@ -40,7 +39,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewGraphTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithGraphView> {
 
     public EntityViewUpdateSubviewGraphTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java
index 7ff47f9385..d45a005077 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.complex;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -51,7 +50,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseEmbeddedComplexTest extends AbstractEntityViewUpdateTest<UpdatableLegacyOrderView> {
 
     @Override
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java
index f5c737a0f9..3a3c185a36 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.entityid;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -46,7 +45,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseEmbeddedEntityIdTest extends AbstractEntityViewUpdateTest<UpdatableLegacyOrderView> {
 
     @Override
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java
index d7e1478c7e..50d5e7ac71 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.simple;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -38,7 +37,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -55,7 +54,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseEmbeddedSimpleTest extends AbstractEntityViewUpdateTest<UpdatableLegacyOrderView> {
 
     @Override
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java
index 7429490776..e9e67a94f3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java
@@ -5,8 +5,13 @@
 
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate;
 import com.blazebit.persistence.testsuite.entity.Document;
@@ -19,13 +24,7 @@
 import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest;
 import com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity.model.DocumentForOneToOneIdView;
 import com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity.model.UpdatableDocumentForOneToOneView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -33,10 +32,8 @@
  * @since 1.3.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-//@Category({ NoDatanucleus.class, NoEclipselink.class})
 // NOTE: Hibernate has a bug when selecting inverse one-to-ones: https://hibernate.atlassian.net/browse/HHH-12885
-@Category({ NoHibernate.class, NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoHibernate.class, NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseOneToOneEntityTest extends AbstractEntityViewUpdateTest<UpdatableDocumentForOneToOneView> {
 
     private DocumentForSimpleOneToOne doc1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java
index 8b53a0641e..f56990aa7c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.simple;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.DocumentForSimpleOneToOne;
@@ -26,7 +25,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  *
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseOneToOneSimpleTest extends AbstractEntityViewUpdateTest<UpdatableDocumentForOneToOneView> {
 
     private DocumentForSimpleOneToOne doc1;
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java
index c0c909b0c2..e0bc50028a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.simple;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseSimpleTest extends AbstractEntityViewUpdateDocumentTest<UpdatablePersonView> {
 
     public EntityViewUpdateSubviewInverseSimpleTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java
index dbe72ac0bc..efbbfb2172 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.subtype;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseSubtypeTest extends AbstractEntityViewUpdateDocumentTest<UpdatablePersonView> {
 
     public EntityViewUpdateSubviewInverseSubtypeTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java
index 164bc74433..ff00336fe8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.inverse.unmapped;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewInverseUmappedTest extends AbstractEntityViewUpdateTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSubviewInverseUmappedTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java
index 8c67c37171..99129a1a03 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.multiparent.inverse;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewMultiParentInverseTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithGraphView> {
 
     public EntityViewUpdateSubviewMultiParentInverseTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java
index 45855f691b..e7b4ad5ce1 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.multiparent.jointable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewMultiParentJoinTableTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithGraphView> {
 
     public EntityViewUpdateSubviewMultiParentJoinTableTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java
index 07978f2214..bd89212a79 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.multiparent.selfreferential;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.view.FlushMode;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSubviewMultiParentSelfReferentialTest extends AbstractEntityViewUpdateTest<UpdatablePersonView> {
 
     public EntityViewUpdateSubviewMultiParentSelfReferentialTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java
index c1d870e986..9c659ed020 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java
index aca818c57e..c1ee301276 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedCreatableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedCreatableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java
index 6f9be7aac6..c4b2a46fe3 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java
index 132a37782f..3d1aeaa6fa 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java
index e49d9c7902..9168fd4dad 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedImmutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java
index 06a229ba9f..880c6e5293 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java
index de15f52193..3e12f5d8e0 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java
index 28e3961d30..6a21927281 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java
@@ -5,8 +5,16 @@
 
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -17,16 +25,10 @@
 import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableDocumentWithMapsView;
 import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableFriendPersonView;
 import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableResponsiblePersonView;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.HashMap;
-import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  *
@@ -34,8 +36,7 @@
  * @since 1.2.0
  */
 @RunWith(Parameterized.class)
-// NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class })
+@Category({ NoEclipselink.class })
 public class EntityViewUpdateNestedMutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedMutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java
index 668612e9a1..958425345e 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java
index 61aaf40d22..336fbcc3e8 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java
index 015a7e1f63..7ab225bd6d 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedMutableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java
index 87048382dc..24541f6bff 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java
index 0d3b942322..5079462c60 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java
index 48fa5cef5c..50c5e31fa6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -36,7 +35,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedUpdatableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateNestedUpdatableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java
index 2a95dce54d..ac4b337593 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateNestedUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateNestedUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java
index 0699f73582..25257dd32f 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java
index 0c7969824e..50ae34ec03 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleCreatableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleCreatableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java
index b1ee92010e..1dd1f1885a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -33,7 +32,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
index 7e48686f4a..63ca2569c4 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
index d0ce3586b8..a854150100 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java
index e8908b0dbe..bc89b563f6 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.FlushMode;
@@ -30,7 +29,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java
index 840ca2c112..51b4a7994a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -37,7 +36,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java
index 294e40edc9..796ac9215a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleMutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java
index 8dae4d5f81..98b369b30a 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java
index e2d03b655a..45b979fa8c 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java
index 04b0b9279f..fe3fc20646 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleMutableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java
index 618d31fc10..c0755c1670 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java
index fe8ab6ba50..42e3600b75 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -35,7 +34,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithCollectionsView> {
 
     public EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java
index 9d545e80d1..b5ba311986 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
@@ -34,7 +33,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentWithMapsView> {
 
     public EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java
index 53f21ccbd5..dde37c7522 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java
@@ -6,7 +6,6 @@
 package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly;
 
 import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.view.ConfigurationProperties;
@@ -32,7 +31,7 @@
  */
 @RunWith(Parameterized.class)
 // NOTE: No Datanucleus support yet
-@Category({ NoDatanucleus.class, NoEclipselink.class})
+@Category({ NoEclipselink.class})
 public class EntityViewUpdateSimpleUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest<UpdatableDocumentView> {
 
     public EntityViewUpdateSimpleUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) {
diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java
index 5c8fcc8fe3..00f8203acd 100644
--- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java
+++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.view.testsuite.viewroot;
 
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.tx.TxVoidWork;
@@ -22,12 +22,7 @@
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest;
 import com.blazebit.persistence.view.testsuite.viewroot.model.DocumentWithViewRoots;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.EntityManager;
-import java.util.List;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,11 +31,8 @@
  * @author Christian Beikov
  * @since 1.6.0
  */
-// NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
 // NOTE: Eclipselink doesn't like the limit subquery function
-// NOTE: Datanucleus can't handle "alias IN (subquery)"
-// NOTE: Requires lateral joins or support for correlated limit subquery in ON clause which older MySQL versions don't support
-@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class, NoMySQLOld.class })
+@Category({ NoEclipselink.class })
 public class SecondaryViewRootTest extends AbstractEntityViewTest {
 
     private Document doc1;
diff --git a/examples/deltaspike-data-rest/pom.xml b/examples/deltaspike-data-rest/pom.xml
index 117db4ff3e..a2a54fd4c4 100644
--- a/examples/deltaspike-data-rest/pom.xml
+++ b/examples/deltaspike-data-rest/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -21,12 +21,10 @@
     <properties>
         <module.name>com.blazebit.persistence.examples.deltaspike.data.rest</module.name>
         <!-- Don't test compiling to newer classfile versions to avoid having to deal with Deltaspike updates -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
-        <!-- For Hibernate 5.2 use "5.2" -->
-        <version.integration-hibernate>5</version.integration-hibernate>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <version.eclipselink>2.6.4</version.eclipselink>
     </properties>
 
@@ -35,7 +33,7 @@
             <dependency>
                 <groupId>org.apache.deltaspike.distribution</groupId>
                 <artifactId>distributions-bom</artifactId>
-                <version>${version.deltaspike-1.9}</version>
+                <version>${version.deltaspike-2.0}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -44,26 +42,53 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-8.0</artifactId>
-            <version>1.0.4.Final</version>
-            <type>pom</type>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.taglibs</groupId>
-                    <artifactId>taglibs-standard-spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.taglibs</groupId>
-                    <artifactId>taglibs-standard-impl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -112,7 +137,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -152,19 +177,6 @@
             <artifactId>weld-se-core</artifactId>
             <version>${version.weld}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>${version.jandex}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -192,7 +204,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
@@ -233,24 +245,24 @@
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-${version.integration-hibernate}</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
                     <version>${version.hibernate}</version>
-                    <scope>test</scope>
+                    <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.resteasy</groupId>
                     <artifactId>resteasy-jackson2-provider</artifactId>
-                    <version>3.0.8.Final</version>
+                    <version>6.2.10.Final</version>
                     <scope>provided</scope>
                 </dependency>
 
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
                     <version>${version.hibernate}</version>
                     <scope>provided</scope>
@@ -259,50 +271,40 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -314,22 +316,17 @@
                     <groupId>com.blazebit</groupId>
                     <artifactId>blaze-persistence-integration-eclipselink</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.1</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.eclipse.persistence</groupId>
                     <artifactId>eclipselink</artifactId>
                     <version>${version.eclipselink}</version>
-                    <scope>test</scope>
+                    <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.glassfish.jersey.media</groupId>
                     <artifactId>jersey-media-json-jackson</artifactId>
-                    <version>2.23.1</version>
+                    <version>3.1.9</version>
+                    <scope>provided</scope>
                 </dependency>
 
                 <!-- IntelliJ apparently needs the annotation processor here -->
@@ -343,53 +340,44 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/main/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -405,24 +393,24 @@
                 </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-${version.integration-hibernate}</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
                     <version>${version.hibernate}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.resteasy</groupId>
                     <artifactId>resteasy-jackson2-provider</artifactId>
-                    <version>3.0.8.Final</version>
+                    <version>6.2.10.Final</version>
                     <scope>provided</scope>
                 </dependency>
 
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
                     <version>${version.hibernate}</version>
                     <scope>provided</scope>
@@ -431,76 +419,46 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/Application.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/Application.java
index 65c8fcc61e..61aee0c578 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/Application.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/Application.java
@@ -8,10 +8,10 @@
 import com.blazebit.persistence.examples.deltaspike.data.rest.model.Cat;
 import com.blazebit.persistence.examples.deltaspike.data.rest.model.Person;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.ws.rs.ApplicationPath;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.ws.rs.ApplicationPath;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -20,10 +20,10 @@
  * @author Christian Beikov
  * @since 1.2.0
  */
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 @ApplicationPath("rest")
-public class Application extends javax.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     @Inject
     private EntityManager em;
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/CriteriaBuilderFactoryProducer.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/CriteriaBuilderFactoryProducer.java
index 0de0e32553..8ca492ac05 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/CriteriaBuilderFactoryProducer.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/CriteriaBuilderFactoryProducer.java
@@ -9,18 +9,18 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Christian Beikov
  * @since 1.2.0
  */
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class CriteriaBuilderFactoryProducer {
 
     // inject your entity manager factory
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityManagerProducer.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityManagerProducer.java
index eff8677ea5..73088072dc 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityManagerProducer.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityManagerProducer.java
@@ -5,18 +5,18 @@
 
 package com.blazebit.persistence.examples.deltaspike.data.rest.config;
 
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
  * @since 1.2.0
  */
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityManagerProducer {
 
     // inject your entity manager factory
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityViewManagerProducer.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityViewManagerProducer.java
index c88ff13bb0..feaac11cde 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityViewManagerProducer.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/config/EntityViewManagerProducer.java
@@ -9,17 +9,17 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 /**
  * @author Christian Beikov
  * @since 1.2.0
  */
-@javax.ejb.Singleton
-@javax.ejb.Startup
+@jakarta.ejb.Singleton
+@jakarta.ejb.Startup
 public class EntityViewManagerProducer {
 
     // inject the configuration provided by the cdi integration
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/controller/CatRestController.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/controller/CatRestController.java
index 381859d03d..7fab391abd 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/controller/CatRestController.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/controller/CatRestController.java
@@ -20,22 +20,22 @@
 import com.blazebit.text.ParserContext;
 import com.blazebit.text.SerializableFormat;
 
-import javax.inject.Inject;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-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.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+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.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -130,7 +130,7 @@ public Predicate toPredicate(Root<Cat> root, CriteriaQuery<?> criteriaQuery, Cri
                         SerializableFormat<?> format = FILTER_ATTRIBUTES.get(f.getField());
                         if (format != null) {
                             String[] fieldParts = f.getField().split("\\.");
-                            javax.persistence.criteria.Path<?> path = root.get(fieldParts[0]);
+                            jakarta.persistence.criteria.Path<?> path = root.get(fieldParts[0]);
                             for (int i = 1; i < fieldParts.length; i++) {
                                 path = path.get(fieldParts[i]);
                             }
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverter.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverter.java
index 72cde9ed1f..bd65e0e209 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverter.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverter.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import javax.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverter;
 import java.io.IOException;
 
 /**
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverterProvider.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverterProvider.java
index 27bf783c00..63de589a5c 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverterProvider.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/filter/FilterParamConverterProvider.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.examples.deltaspike.data.rest.filter;
 
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Cat.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Cat.java
index 6b9566b88d..e5facd0b23 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Cat.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Cat.java
@@ -8,13 +8,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Person.java b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Person.java
index ce37a44c2a..0d331d2ec4 100644
--- a/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Person.java
+++ b/examples/deltaspike-data-rest/src/main/java/com/blazebit/persistence/examples/deltaspike/data/rest/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.deltaspike.data.rest.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/deltaspike-data-rest/src/main/resources/META-INF/beans.xml b/examples/deltaspike-data-rest/src/main/resources/META-INF/beans.xml
index 2f83c6ad28..1b6e67940a 100644
--- a/examples/deltaspike-data-rest/src/main/resources/META-INF/beans.xml
+++ b/examples/deltaspike-data-rest/src/main/resources/META-INF/beans.xml
@@ -3,7 +3,10 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-    <!-- Need this here so the tests run, as they don't see the beans.xml from webapp/WEB-INF -->
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file
diff --git a/examples/deltaspike-data-rest/src/main/resources/META-INF/persistence.xml b/examples/deltaspike-data-rest/src/main/resources/META-INF/persistence.xml
index ec291ff38c..883c4a07a5 100644
--- a/examples/deltaspike-data-rest/src/main/resources/META-INF/persistence.xml
+++ b/examples/deltaspike-data-rest/src/main/resources/META-INF/persistence.xml
@@ -8,11 +8,11 @@
     <class>com.blazebit.persistence.examples.deltaspike.data.rest.model.Person</class>
     <class>com.blazebit.persistence.examples.deltaspike.data.rest.model.Cat</class>
     <properties>
-      <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-      <property name="javax.persistence.jdbc.user" value="admin"/>
-      <property name="javax.persistence.jdbc.password" value="admin"/>
-      <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-      <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+      <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+      <property name="jakarta.persistence.jdbc.user" value="admin"/>
+      <property name="jakarta.persistence.jdbc.password" value="admin"/>
+      <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+      <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
     </properties>
   </persistence-unit>
 </persistence>
diff --git a/examples/deltaspike-data-rest/src/main/webapp/WEB-INF/beans.xml b/examples/deltaspike-data-rest/src/main/webapp/WEB-INF/beans.xml
index dc74ca17f4..e9eaf6401b 100644
--- a/examples/deltaspike-data-rest/src/main/webapp/WEB-INF/beans.xml
+++ b/examples/deltaspike-data-rest/src/main/webapp/WEB-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file
diff --git a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/AbstractSampleTest.java b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/AbstractSampleTest.java
index 0427933202..0e9b5853ce 100644
--- a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/AbstractSampleTest.java
+++ b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/AbstractSampleTest.java
@@ -18,9 +18,9 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 import java.util.function.Consumer;
 
 /**
diff --git a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/EntityManagerFactoryHolder.java b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/EntityManagerFactoryHolder.java
index 941410a0b9..20e2cc3595 100644
--- a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/EntityManagerFactoryHolder.java
+++ b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/EntityManagerFactoryHolder.java
@@ -5,15 +5,15 @@
 
 package com.blazebit.persistence.examples.deltaspike.data.rest;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Disposes;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly.
diff --git a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/SampleTest.java b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/SampleTest.java
index b6eb6dbcd4..b64458aadf 100644
--- a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/SampleTest.java
+++ b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/SampleTest.java
@@ -13,7 +13,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Christian Beikov
diff --git a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/TestExtension.java b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/TestExtension.java
index e43d14ab66..160d183782 100644
--- a/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/TestExtension.java
+++ b/examples/deltaspike-data-rest/src/test/java/com/blazebit/persistence/examples/deltaspike/data/rest/TestExtension.java
@@ -8,9 +8,9 @@
 
 import com.blazebit.persistence.examples.deltaspike.data.rest.config.EntityManagerProducer;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 /**
  * In the test, we have to produce the EntityManagerFactory and EntityManager manually.
diff --git a/examples/deltaspike-data-rest/src/test/resources/META-INF/beans.xml b/examples/deltaspike-data-rest/src/test/resources/META-INF/beans.xml
index dc74ca17f4..1b6e67940a 100644
--- a/examples/deltaspike-data-rest/src/test/resources/META-INF/beans.xml
+++ b/examples/deltaspike-data-rest/src/test/resources/META-INF/beans.xml
@@ -3,6 +3,10 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file
diff --git a/examples/deltaspike-data-rest/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/examples/deltaspike-data-rest/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from examples/deltaspike-data-rest/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to examples/deltaspike-data-rest/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/examples/it-service-management/pom.xml b/examples/it-service-management/pom.xml
index 4750abb18b..4991f10ccf 100644
--- a/examples/it-service-management/pom.xml
+++ b/examples/it-service-management/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,11 +20,9 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.itsm</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-        <junit-jupiter.version>5.9.3</junit-jupiter.version>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
         <start-class>com.blazebit.persistence.examples.itsm.SpringBlazeApplication</start-class>
     </properties>
 
@@ -63,14 +61,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.6}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-6.6}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-envers</artifactId>
-            <version>${version.hibernate-5.6}</version>
+            <version>${version.hibernate-6.6}</version>
         </dependency>
 
         <!-- Core dependencies -->
@@ -84,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
         <!-- Entity View dependencies -->
@@ -104,11 +102,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -123,7 +121,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.7}</version>
+            <version>${version.spring-data-3.3}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -140,13 +138,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -176,13 +167,13 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>${version.hibernate-5.6}</version>
+            <version>${version.hibernate-6.6}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -202,78 +193,52 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <compilerArgs>
-                        <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
-                    </compilerArgs>
+                    <annotationProcessorPaths>
+                        <!-- Metamodel -->
+                        <dependency>
+                            <groupId>org.hibernate.orm</groupId>
+                            <artifactId>hibernate-jpamodelgen</artifactId>
+                            <version>${version.hibernate-6.6}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${version.jaxb-api}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-impl</artifactId>
+                            <version>${version.jaxb}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.transaction</groupId>
+                            <artifactId>jakarta.transaction-api</artifactId>
+                            <version>${version.jta-api}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>${version.activation-api}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                    </annotationProcessors>
                 </configuration>
             </plugin>
-
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/metamodel</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                            <processors>
-                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
                 <dependencies>
-                    <!-- Metamodel -->
-                    <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-jpamodelgen</artifactId>
-                        <version>${version.hibernate-5.6}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>${version.jaxb-api}</version>
-                    </dependency>
                     <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>${version.jaxb}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.transaction</groupId>
-                        <artifactId>jakarta.transaction-api</artifactId>
-                        <version>${version.jta}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                        <version>${version.activation}</version>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${version.junit-vintage}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -293,103 +258,51 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-AstrictCascadingCheck=false</compilerArg>
+                                <compilerArg>-AdefaultVersionAttributeName=version</compilerArg>
+                                <compilerArg>-AdefaultVersionAttributeType=java.lang.Long</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/BlazeConfiguration.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/BlazeConfiguration.java
index 4262b8da75..4fe9773272 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/BlazeConfiguration.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/BlazeConfiguration.java
@@ -16,8 +16,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Article.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Article.java
index 27de16e746..e37d0a9387 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Article.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Article.java
@@ -7,12 +7,12 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Version;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Version;
 
 import org.hibernate.envers.Audited;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Attachment.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Attachment.java
index 72d2eae53e..d2e192a3b2 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Attachment.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Attachment.java
@@ -7,7 +7,7 @@
 
 import java.util.Objects;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedEntity.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedEntity.java
index 385f1be615..e1a750d478 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedEntity.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedEntity.java
@@ -8,11 +8,11 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import javax.persistence.Embedded;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedString.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedString.java
index 5c3e9dfce0..65eee32000 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedString.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/LocalizedString.java
@@ -10,8 +10,8 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Person.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Person.java
index 147ade4649..84eca4dfd0 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Person.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/entity/Person.java
@@ -9,10 +9,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 import org.hibernate.envers.Audited;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/view/LocalizedEntityId.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/view/LocalizedEntityId.java
index 454532cb06..2bda077ec0 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/view/LocalizedEntityId.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/article/view/LocalizedEntityId.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.itsm.model.article.view;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 import com.blazebit.persistence.examples.itsm.model.article.entity.LocalizedEntity;
 import com.blazebit.persistence.examples.itsm.model.article.entity.LocalizedEntity_;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/EntityRevision.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/EntityRevision.java
index d2816db954..82f6bddcf7 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/EntityRevision.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/EntityRevision.java
@@ -10,11 +10,11 @@
 import org.hibernate.envers.RevisionNumber;
 import org.hibernate.envers.RevisionTimestamp;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.Date;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Group.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Group.java
index 82516fac1b..c818958b5e 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Group.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Group.java
@@ -9,11 +9,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 
 import org.hibernate.envers.Audited;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Role.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Role.java
index 8f6dab0f80..412a17cfca 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Role.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/Role.java
@@ -8,11 +8,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 
 import org.hibernate.envers.Audited;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/User.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/User.java
index 16e8c70b18..572237a862 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/User.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/User.java
@@ -14,14 +14,14 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
 
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/UserSession.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/UserSession.java
index 9e3c2e554a..c1c8298bce 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/UserSession.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/entity/UserSession.java
@@ -8,10 +8,10 @@
 import java.time.Instant;
 import java.util.Objects;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/repository/UserRepository.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/repository/UserRepository.java
index 332fa09483..77ade7d59c 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/repository/UserRepository.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/repository/UserRepository.java
@@ -17,10 +17,10 @@
 import com.blazebit.persistence.examples.itsm.model.common.entity.User_;
 import com.blazebit.persistence.examples.itsm.model.common.view.UserDetail;
 
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Subquery;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/view/AuditedView.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/view/AuditedView.java
index d2171a6b25..190fe972bf 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/view/AuditedView.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/common/view/AuditedView.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 
-import javax.persistence.EntityManager;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.metamodel.EntityType;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -94,7 +94,7 @@ private EntityType<?> getAuditEntityType(
             String entityName = metamodel.entityPersister(entityClass)
                     .getEntityName();
             String auditedEntityName = this.getEnvers(serviceProvider)
-                    .getAuditEntitiesConfiguration()
+                    .getConfig()
                     .getAuditEntityName(entityName);
             return metamodel.entity(auditedEntityName);
         }
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/AbstractCustomer.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/AbstractCustomer.java
index 26c5218ae0..8d97a8bf6f 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/AbstractCustomer.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/AbstractCustomer.java
@@ -8,17 +8,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.OneToMany;
-import javax.persistence.SecondaryTable;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SecondaryTable;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Company.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Company.java
index d8a29dab7f..e3ed5b1e58 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Company.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Company.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.itsm.model.customer.entity;
 
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Customer.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Customer.java
index 818a53cc5a..7c2322abb2 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Customer.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Customer.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.examples.itsm.model.customer.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContract.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContract.java
index c5ba201b15..c1bbc73b11 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContract.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContract.java
@@ -10,21 +10,21 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.SecondaryTable;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SecondaryTable;
+
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
-import org.hibernate.annotations.Type;
+import org.hibernate.type.SqlTypes;
 
 /**
  * @author Giovanni Lovato
@@ -83,8 +83,7 @@ public enum ChangeStatus {
     @ManyToMany
     private Set<ServiceItem> serviceItems;
 
-    @Lob
-    @Type(type = "text")
+    @JdbcTypeCode(SqlTypes.LONG32VARCHAR)
     @Column(table = DETAIL)
     private String note;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContractFilter.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContractFilter.java
index 0a5e4c7468..4b9d745052 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContractFilter.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceContractFilter.java
@@ -7,13 +7,13 @@
 
 import org.springframework.data.jpa.domain.Specification;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceDetail.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceDetail.java
index ead8c1f2f7..3b01345b6a 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceDetail.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceDetail.java
@@ -7,11 +7,11 @@
 
 import com.blazebit.persistence.examples.itsm.model.common.entity.User;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OrderColumn;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.ArrayList;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceItem.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceItem.java
index 639683fb60..defbad53cd 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceItem.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ServiceItem.java
@@ -9,10 +9,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ShippingAddress.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ShippingAddress.java
index 225dfdb319..2021c9bff0 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ShippingAddress.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/ShippingAddress.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.examples.itsm.model.customer.entity;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Switchboard.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Switchboard.java
index 97bef27733..cc19554b97 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Switchboard.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/Switchboard.java
@@ -24,12 +24,12 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 import org.hibernate.annotations.SortNatural;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardAddress.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardAddress.java
index df4d3661b1..170c20756b 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardAddress.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardAddress.java
@@ -8,7 +8,7 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardInterface.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardInterface.java
index f9bfdfee04..116c10d3cf 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardInterface.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/entity/SwitchboardInterface.java
@@ -8,7 +8,7 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/view/AbstractCustomerSummary.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/view/AbstractCustomerSummary.java
index eb4738d7ec..a9ae038c36 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/view/AbstractCustomerSummary.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/customer/view/AbstractCustomerSummary.java
@@ -8,13 +8,13 @@
 import java.util.Collections;
 import java.util.Set;
 
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 
 import com.blazebit.persistence.CTE;
 import com.blazebit.persistence.JoinType;
@@ -48,7 +48,7 @@ public interface AbstractCustomerSummary extends AbstractCustomerBase {
     @EntityView(TicketCountCte.class)
     interface TicketAggregateView {
 
-        String getCustomerId();
+        Long getCustomerId();
 
         @Mapping("coalesce(totalTicketCount, 0L)")
         long getTotalTicketCount();
@@ -62,7 +62,7 @@ interface TicketAggregateView {
     @Entity
     class TicketCountCte {
         @Id
-        String customerId;
+        Long customerId;
         long totalTicketCount;
         long openTicketCount;
     }
@@ -76,7 +76,7 @@ class TicketCountCte {
     @EntityView(ContractCountCte.class)
     interface ContractAggregateView {
 
-        String getCustomerId();
+        Long getCustomerId();
 
         @Mapping("coalesce(totalContractCount, 0L)")
         long getTotalContractCount();
@@ -90,7 +90,7 @@ interface ContractAggregateView {
     @Entity
     class ContractCountCte {
         @Id
-        String customerId;
+        Long customerId;
         long totalContractCount;
         long activeContractCount;
         @ManyToMany
@@ -123,7 +123,7 @@ public <T> T createSubquery(SubqueryInitiator<T> subqueryInitiator) {
                     .unionAll()
                     .from(ServiceContract.class, "c2")
                     .join("c2.addresses", "a", JoinType.INNER)
-                    .bind("customerId").select("a.id")
+                    .bind("customerId").select("cast_long(a.id)")
                     .bind("totalContractCount").select("count(*)")
                     .bind("activeContractCount").select("count(CASE WHEN c2.endingDate >= current_date THEN 1 END)")
                     .endSet()
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDevice.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDevice.java
index 069401bcc7..cf1d1b53cc 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDevice.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDevice.java
@@ -7,11 +7,11 @@
 
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItem.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItem.java
index 6ae0301f1c..aa396b2c87 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItem.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItem.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.examples.itsm.model.host.entity;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItemLong.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItemLong.java
index 4c74218121..3a44255d00 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItemLong.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/host/entity/HostDeviceItemLong.java
@@ -8,9 +8,9 @@
 import java.time.Instant;
 import java.util.Map;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/Configuration.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/Configuration.java
index 76dccdd3be..949a6b7c8e 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/Configuration.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/Configuration.java
@@ -8,11 +8,11 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.validation.constraints.NotBlank;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.validation.constraints.NotBlank;
 
 import org.hibernate.annotations.NaturalId;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/entity/HotspotConfiguration.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/entity/HotspotConfiguration.java
index a0a5701977..e9c6ab8cc6 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/entity/HotspotConfiguration.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/hotspot/entity/HotspotConfiguration.java
@@ -9,10 +9,10 @@
 import java.util.Locale;
 import java.util.Objects;
 
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.validation.constraints.NotNull;
 
 import com.blazebit.persistence.examples.itsm.model.article.entity.LocalizedString;
 import com.blazebit.persistence.examples.itsm.model.hotspot.Configuration;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/Ticket.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/Ticket.java
index db412019a2..6f0d79829a 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/Ticket.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/Ticket.java
@@ -12,13 +12,12 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Version;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
 
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
@@ -58,11 +57,9 @@ public class Ticket implements Serializable {
 
     Instant creationInstant = Instant.now();
 
-    @OrderBy(TicketComment_.CREATION_INSTANT)
     @OneToMany(mappedBy = TicketComment_.TICKET)
     SortedSet<TicketComment> comments = new TreeSet<>();
 
-    @OrderBy(TicketHistoryItem_.CREATED)
     @OneToMany(mappedBy = TicketHistoryItem_.TICKET)
     @NotAudited
     SortedSet<TicketHistoryItem> history = new TreeSet<>();
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketAssigneeChanged.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketAssigneeChanged.java
index 84912750f3..7da7119223 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketAssigneeChanged.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketAssigneeChanged.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.examples.itsm.model.ticket.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 
 import com.blazebit.persistence.examples.itsm.model.common.entity.User;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketComment.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketComment.java
index 6b39bce1c6..b6e2ef1bb8 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketComment.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketComment.java
@@ -12,13 +12,13 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 import org.hibernate.envers.Audited;
 
@@ -31,7 +31,7 @@
  */
 @Entity
 @Audited
-public class TicketComment implements Serializable {
+public class TicketComment implements Comparable<TicketComment>, Serializable {
 
     @Id
     @GeneratedValue
@@ -95,4 +95,8 @@ public List<Attachment> getAttachments() {
         return this.attachments;
     }
 
+    @Override
+    public int compareTo(TicketComment o) {
+        return creationInstant.compareTo(o.creationInstant);
+    }
 }
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketCommented.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketCommented.java
index 3a4be712f0..5672436ab6 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketCommented.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketCommented.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.examples.itsm.model.ticket.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketFilter.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketFilter.java
index a619c5cd7a..f564e1251b 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketFilter.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketFilter.java
@@ -14,12 +14,12 @@
 import com.blazebit.persistence.examples.itsm.model.customer.entity.ShippingAddress_;
 import org.springframework.data.jpa.domain.Specification;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketHistoryItem.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketHistoryItem.java
index 1e7dabd9a6..590f831fb1 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketHistoryItem.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketHistoryItem.java
@@ -9,13 +9,13 @@
 import java.time.Instant;
 import java.util.Objects;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.ManyToOne;
 
 import com.blazebit.persistence.examples.itsm.model.common.entity.User;
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByComment.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByComment.java
index 27e909da48..ff61c84f8d 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByComment.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByComment.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.examples.itsm.model.ticket.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByTicket.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByTicket.java
index ac3e732746..29e826e556 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByTicket.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketReferencedByTicket.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.itsm.model.ticket.entity;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketStatus.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketStatus.java
index 33310e879c..775a734e1a 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketStatus.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/entity/TicketStatus.java
@@ -6,11 +6,9 @@
 package com.blazebit.persistence.examples.itsm.model.ticket.entity;
 
 import com.blazebit.persistence.examples.itsm.model.article.entity.LocalizedEntity;
-import com.blazebit.persistence.examples.itsm.model.article.entity.LocalizedEntity_;
 
-import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
-import javax.persistence.OrderBy;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToMany;
 import java.util.Comparator;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -41,7 +39,6 @@ public class TicketStatus extends LocalizedEntity
 
     private String theme;
 
-    @OrderBy(LocalizedEntity_.NAME)
     @ManyToMany
     private SortedSet<TicketStatus> next = new TreeSet<>();
 
diff --git a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/view/TicketSummary.java b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/view/TicketSummary.java
index f8b412bbf7..5006c3bcca 100644
--- a/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/view/TicketSummary.java
+++ b/examples/it-service-management/src/main/java/com/blazebit/persistence/examples/itsm/model/ticket/view/TicketSummary.java
@@ -9,8 +9,8 @@
 import java.util.Collections;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import com.blazebit.persistence.CTE;
 import com.blazebit.persistence.SubqueryInitiator;
@@ -73,7 +73,7 @@ default boolean isHasUnseenComments() {
     @EntityView(TicketCommentsCTE.class)
     interface TicketCommentAggregate {
 
-        String getTicketNumber();
+        Long getTicketNumber();
 
         @Mapping("coalesce(totalCommentCount, 0L)")
         long getTotalCommentCount();
@@ -87,7 +87,7 @@ interface TicketCommentAggregate {
     @Entity
     class TicketCommentsCTE {
         @Id
-        String ticketNumber;
+        Long ticketNumber;
         long totalCommentCount;
         long seenCommentCount;
     }
diff --git a/examples/it-service-management/src/main/resources/application.yml b/examples/it-service-management/src/main/resources/application.yml
index 9c33829d55..817832a568 100644
--- a/examples/it-service-management/src/main/resources/application.yml
+++ b/examples/it-service-management/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
       hibernate:
         globally_quoted_identifiers: true
         implicit_naming_strategy: com.blazebit.persistence.examples.itsm.ImplicitNamingStrategyComponentPathJoinTable
-        ejb:
+        jpa:
           metamodel:
             population: enabled
       org.hibernate.envers:
diff --git a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/InheritanceCorrelationTest.java b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/InheritanceCorrelationTest.java
index 15578bfc24..3782d1c36a 100644
--- a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/InheritanceCorrelationTest.java
+++ b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/InheritanceCorrelationTest.java
@@ -48,17 +48,17 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Subquery;
 import java.io.Serializable;
 import java.time.Duration;
 import java.time.Instant;
@@ -130,7 +130,7 @@ public static interface CustomerSummary extends AbstractCustomerDetail {
 
     @EntityView(TicketAggregateCte.class)
     public static interface TicketAggregateView extends Serializable {
-        String getCustomerId();
+        Long getCustomerId();
         @Mapping("coalesce(totalTicketCount, 0L)")
         long getTotalTicketCount();
         @Mapping("coalesce(openTicketCount, 0L)")
@@ -142,7 +142,7 @@ public static interface TicketAggregateView extends Serializable {
     @Entity
     public static class TicketAggregateCte implements Serializable {
         @Id
-        String customerId;
+        Long customerId;
         long totalTicketCount;
         long openTicketCount;
     }
diff --git a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/SpringBlazeApplicationTests.java b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/SpringBlazeApplicationTests.java
index 9e1b7a9bd8..84408c5476 100644
--- a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/SpringBlazeApplicationTests.java
+++ b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/SpringBlazeApplicationTests.java
@@ -54,15 +54,15 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Subquery;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -212,7 +212,7 @@ public void testNestedEmbeddables(
             @Autowired ConfigurationViewRepository viewRepository) {
         HotspotConfiguration c = repository.save(new HotspotConfiguration());
         HotspotConfigurationView v = repository.findOne((root, query, builder) -> builder
-                .equal(root.get("id"), c.getId()));
+                .equal(root.get("id"), c.getId())).get();
         this.em.flush();
         this.em.clear();
         v.getLoginConfiguration().getWelcomeMessage().getLocalizedValues()
diff --git a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/UpdatableCollectionTests.java b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/UpdatableCollectionTests.java
index f4484e8452..be42be24c7 100644
--- a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/UpdatableCollectionTests.java
+++ b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/UpdatableCollectionTests.java
@@ -27,7 +27,7 @@
 import com.blazebit.persistence.examples.itsm.model.common.view.RoleDetail;
 import com.blazebit.persistence.examples.itsm.model.common.view.UserDetail;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Giovanni Lovato
diff --git a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/ViewJoinTests.java b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/ViewJoinTests.java
index 38b65825ec..2e064a0a97 100644
--- a/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/ViewJoinTests.java
+++ b/examples/it-service-management/src/test/java/com/blazebit/persistence/examples/itsm/ViewJoinTests.java
@@ -29,10 +29,10 @@
 import com.blazebit.persistence.examples.itsm.model.ticket.entity.TicketFilter;
 import com.blazebit.persistence.examples.itsm.model.ticket.entity.Ticket_;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Subquery;
 
 
 /**
diff --git a/examples/microprofile-graphql/pom.xml b/examples/microprofile-graphql/pom.xml
index 3171f55a7c..f49f1ce9b6 100644
--- a/examples/microprofile-graphql/pom.xml
+++ b/examples/microprofile-graphql/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,33 +20,44 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.microprofile.graphql</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.hibernate-orm>5.4.22.Final</version.hibernate-orm>
+        <version.hibernate-orm>${version.hibernate-6.6}</version.hibernate-orm>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-8.0</artifactId>
-            <version>1.0.4.Final</version>
-            <type>pom</type>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.taglibs</groupId>
-                    <artifactId>taglibs-standard-spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.taglibs</groupId>
-                    <artifactId>taglibs-standard-impl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -120,11 +131,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -145,19 +156,6 @@
             <artifactId>weld-se-core</artifactId>
             <version>${version.weld}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>${version.jandex}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -185,7 +183,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/Application.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/Application.java
index de2acf18c0..ca6d8d4107 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/Application.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/Application.java
@@ -8,12 +8,12 @@
 import com.blazebit.persistence.examples.microprofile.graphql.model.Cat;
 import com.blazebit.persistence.examples.microprofile.graphql.model.Person;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/GraphQLProducer.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/GraphQLProducer.java
index cefb271a47..95a35dbf6c 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/GraphQLProducer.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/GraphQLProducer.java
@@ -14,13 +14,13 @@
 import io.smallrye.graphql.json.JsonBCreator;
 import io.smallrye.graphql.scalar.GraphQLScalarTypes;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 import java.lang.reflect.Field;
 import java.util.Map;
 
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/CriteriaBuilderFactoryProducer.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/CriteriaBuilderFactoryProducer.java
index 8fd4ec6c86..2b3fe98e4d 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/CriteriaBuilderFactoryProducer.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/CriteriaBuilderFactoryProducer.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Christian Beikov
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityManagerProducer.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityManagerProducer.java
index 216ee11610..c830f773f5 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityManagerProducer.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityManagerProducer.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.examples.microprofile.graphql.config;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityViewManagerProducer.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityViewManagerProducer.java
index 976b797f8a..c989e85fb9 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityViewManagerProducer.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/config/EntityViewManagerProducer.java
@@ -9,12 +9,12 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 /**
  * @author Christian Beikov
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Cat.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Cat.java
index 06b7606b60..3f58dcc705 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Cat.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Cat.java
@@ -8,13 +8,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/ListStringConverter.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/ListStringConverter.java
index bec7f12394..39843c5de8 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/ListStringConverter.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/ListStringConverter.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.microprofile.graphql.model;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Person.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Person.java
index 3e95e7b2dd..e31b5fa856 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Person.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.microprofile.graphql.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/repository/CatViewRepository.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/repository/CatViewRepository.java
index 6e86f25071..d6efac45b7 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/repository/CatViewRepository.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/repository/CatViewRepository.java
@@ -10,9 +10,9 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/CatResource.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/CatResource.java
index d1d6757879..6d01a52d4f 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/CatResource.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/CatResource.java
@@ -26,18 +26,18 @@
 import org.eclipse.microprofile.graphql.Query;
 import org.eclipse.microprofile.graphql.Source;
 
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.net.URI;
 import java.util.List;
 
diff --git a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/PersonResource.java b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/PersonResource.java
index 380685d1cc..0111d03de4 100644
--- a/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/PersonResource.java
+++ b/examples/microprofile-graphql/src/main/java/com/blazebit/persistence/examples/microprofile/graphql/resource/PersonResource.java
@@ -6,17 +6,17 @@
 package com.blazebit.persistence.examples.microprofile.graphql.resource;
 
 import java.net.URI;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.examples.microprofile.graphql.model.Person;
diff --git a/examples/microprofile-graphql/src/main/resources/META-INF/persistence.xml b/examples/microprofile-graphql/src/main/resources/META-INF/persistence.xml
index 66ed4864e4..1941bf56c4 100644
--- a/examples/microprofile-graphql/src/main/resources/META-INF/persistence.xml
+++ b/examples/microprofile-graphql/src/main/resources/META-INF/persistence.xml
@@ -8,11 +8,11 @@
     <class>com.blazebit.persistence.examples.microprofile.graphql.model.Person</class>
     <class>com.blazebit.persistence.examples.microprofile.graphql.model.Cat</class>
     <properties>
-      <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-      <property name="javax.persistence.jdbc.user" value="admin"/>
-      <property name="javax.persistence.jdbc.password" value="admin"/>
-      <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-      <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+      <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
+      <property name="jakarta.persistence.jdbc.user" value="admin"/>
+      <property name="jakarta.persistence.jdbc.password" value="admin"/>
+      <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+      <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
     </properties>
   </persistence-unit>
 </persistence>
diff --git a/examples/microprofile-graphql/src/test/java/com/blazebit/persistence/examples/microprofile/graphql/repository/AbstractSampleTest.java b/examples/microprofile-graphql/src/test/java/com/blazebit/persistence/examples/microprofile/graphql/repository/AbstractSampleTest.java
index 04a23761b6..5644aae433 100644
--- a/examples/microprofile-graphql/src/test/java/com/blazebit/persistence/examples/microprofile/graphql/repository/AbstractSampleTest.java
+++ b/examples/microprofile-graphql/src/test/java/com/blazebit/persistence/examples/microprofile/graphql/repository/AbstractSampleTest.java
@@ -9,10 +9,10 @@
 import com.blazebit.persistence.examples.microprofile.graphql.model.Person;
 import org.junit.Before;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/pom.xml b/examples/pom.xml
index 791ce4f81f..a50c624660 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -26,33 +26,8 @@
         <module>spring-data-dgs</module>
         <module>spring-hateoas</module>
         <module>it-service-management</module>
-        <module>quarkus</module>
-<!--        <module>quarkus-3</module>-->
+        <module>quarkus-3</module>
         <module>microprofile-graphql</module>
     </modules>
 
-    <!-- Hibernate 6 is compiled with JDK 11, so we can only compile it, if we the build is running on a JDK 11 -->
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <modules>
-                <module>showcase</module>
-                <module>deltaspike-data-rest</module>
-                <module>spring-data-webmvc</module>
-                <module>spring-data-webflux</module>
-                <module>spring-data-graphql</module>
-                <module>spring-data-spqr</module>
-                <module>spring-data-dgs</module>
-                <module>spring-hateoas</module>
-                <module>it-service-management</module>
-                <module>quarkus</module>
-                <module>quarkus-3</module>
-                <module>microprofile-graphql</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/base/pom.xml b/examples/quarkus-3/base/pom.xml
index e528e38d3e..9a5a1eaf48 100644
--- a/examples/quarkus-3/base/pom.xml
+++ b/examples/quarkus-3/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
+            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
@@ -58,7 +58,7 @@
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
@@ -67,81 +67,46 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <version>3.3.2</version>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <addGeneratedAnnotation>false</addGeneratedAnnotation>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-orm}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -151,7 +116,7 @@
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
@@ -160,81 +125,50 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <version>3.3.2</version>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <addGeneratedAnnotation>false</addGeneratedAnnotation>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-orm}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-orm}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/quarkus-3/pom.xml b/examples/quarkus-3/pom.xml
index b94565fba2..f672f58eaa 100644
--- a/examples/quarkus-3/pom.xml
+++ b/examples/quarkus-3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -16,8 +16,6 @@
     </modules>
 
     <properties>
-        <main.java.version>11</main.java.version>
-        <version.jandex>3.0.5</version.jandex>
         <version.hibernate-orm>${version.hibernate-6.2}</version.hibernate-orm>
     </properties>
 
@@ -30,12 +28,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>jakarta.persistence</groupId>
-                <artifactId>jakarta.persistence-api</artifactId>
-                <version>${version.jakarta-jpa-3.1-api}</version>
-                <scope>provided</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/base/pom.xml b/examples/quarkus-3/testsuite/base/pom.xml
index b215d7d8e9..9b736457d0 100644
--- a/examples/quarkus-3/testsuite/base/pom.xml
+++ b/examples/quarkus-3/testsuite/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -20,11 +20,52 @@
             <artifactId>blaze-persistence-examples-quarkus-3-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -46,12 +87,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -93,7 +128,7 @@
             </build>
         </profile>
         <profile>
-            <id>mysql8</id>
+            <id>mysql</id>
             <dependencies>
                 <dependency>
                     <groupId>io.quarkus</groupId>
@@ -109,7 +144,7 @@
                                 <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                                 <!-- Required for JDK 16 -->
                                 <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                                <quarkus.test.profile>mysql8</quarkus.test.profile>
+                                <quarkus.test.profile>mysql</quarkus.test.profile>
                             </systemPropertyVariables>
                             <skip>false</skip>
                         </configuration>
@@ -180,6 +215,9 @@
         </profile>
         <profile>
             <id>h2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>io.quarkus</groupId>
diff --git a/examples/quarkus-3/testsuite/base/src/test/resources/application.properties b/examples/quarkus-3/testsuite/base/src/test/resources/application.properties
index ad6627ab56..56f2dfc5c3 100644
--- a/examples/quarkus-3/testsuite/base/src/test/resources/application.properties
+++ b/examples/quarkus-3/testsuite/base/src/test/resources/application.properties
@@ -9,10 +9,9 @@ dbHost=localhost
 %h2.quarkus.datasource.username=username-default
 %h2.quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 
-%mysql8.quarkus.datasource.db-kind=mysql
-%mysql8.quarkus.datasource.username=root
-%mysql8.quarkus.datasource.jdbc.url=jdbc:mysql://${dbHost}:3306/test?useUnicode=true&characterEncoding=utf8&databaseTerm=schema&nullDatabaseMeansCurrent=true
-%mysql8.quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect
+%mysql.quarkus.datasource.db-kind=mysql
+%mysql.quarkus.datasource.username=root
+%mysql.quarkus.datasource.jdbc.url=jdbc:mysql://${dbHost}:3306/test?useUnicode=true&characterEncoding=utf8&databaseTerm=schema&nullDatabaseMeansCurrent=true
 
 %mssql.quarkus.datasource.db-kind=mssql
 %mssql.quarkus.datasource.username=sa
diff --git a/examples/quarkus-3/testsuite/native/db2/pom.xml b/examples/quarkus-3/testsuite/native/db2/pom.xml
index e4b61d1543..79fc49e60b 100644
--- a/examples/quarkus-3/testsuite/native/db2/pom.xml
+++ b/examples/quarkus-3/testsuite/native/db2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,6 +24,51 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-db2</artifactId>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,26 +117,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/native/h2/pom.xml b/examples/quarkus-3/testsuite/native/h2/pom.xml
index 91a87249e8..f8e9c62e20 100644
--- a/examples/quarkus-3/testsuite/native/h2/pom.xml
+++ b/examples/quarkus-3/testsuite/native/h2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,6 +29,51 @@
             <artifactId>quarkus-test-h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,26 +122,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/native/mssql/pom.xml b/examples/quarkus-3/testsuite/native/mssql/pom.xml
index 1e768dc222..b524f205eb 100644
--- a/examples/quarkus-3/testsuite/native/mssql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/mssql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,6 +24,51 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-mssql</artifactId>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,9 +115,9 @@
                         <version>${project.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-entitymanager</artifactId>
-                        <version>${version.hibernate-4.3}</version>
+                        <groupId>org.hibernate.orm</groupId>
+                        <artifactId>hibernate-core</artifactId>
+                        <version>${version.hibernate-6.6}</version>
                     </dependency>
                     <dependency>
                         <groupId>com.microsoft.sqlserver</groupId>
@@ -125,26 +170,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/native/mysql/pom.xml b/examples/quarkus-3/testsuite/native/mysql/pom.xml
index c0d2cff312..9c29ce16ee 100644
--- a/examples/quarkus-3/testsuite/native/mysql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/mysql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,6 +24,51 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-mysql</artifactId>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,26 +117,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/native/mysql/src/main/resources/application.properties b/examples/quarkus-3/testsuite/native/mysql/src/main/resources/application.properties
index ff8fe4573e..45d86b9353 100644
--- a/examples/quarkus-3/testsuite/native/mysql/src/main/resources/application.properties
+++ b/examples/quarkus-3/testsuite/native/mysql/src/main/resources/application.properties
@@ -1,7 +1,6 @@
 quarkus.datasource.db-kind=mysql
 quarkus.datasource.username=root
 quarkus.datasource.jdbc.url=jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8
-quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.log.sql=false
diff --git a/examples/quarkus-3/testsuite/native/pom.xml b/examples/quarkus-3/testsuite/native/pom.xml
index 2cf94485c7..9c932ac41d 100644
--- a/examples/quarkus-3/testsuite/native/pom.xml
+++ b/examples/quarkus-3/testsuite/native/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -25,7 +25,7 @@
             </modules>
         </profile>
         <profile>
-            <id>mysql8</id>
+            <id>mysql</id>
             <modules>
                 <module>mysql</module>
             </modules>
diff --git a/examples/quarkus-3/testsuite/native/postgresql/pom.xml b/examples/quarkus-3/testsuite/native/postgresql/pom.xml
index 344b92a2d4..79905f2403 100644
--- a/examples/quarkus-3/testsuite/native/postgresql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/postgresql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,6 +24,51 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-postgresql</artifactId>
         </dependency>
+
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,26 +117,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/examples/quarkus-3/testsuite/pom.xml b/examples/quarkus-3/testsuite/pom.xml
index c8029f80bf..4f43a581af 100644
--- a/examples/quarkus-3/testsuite/pom.xml
+++ b/examples/quarkus-3/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus/base/pom.xml b/examples/quarkus/base/pom.xml
deleted file mode 100644
index 76e9989609..0000000000
--- a/examples/quarkus/base/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-base</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.examples.quarkus.base</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-server-common-deployment</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-quarkus</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>hibernate-apt</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <version>3.3.2</version>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-orm}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>native</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <version>3.3.2</version>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-orm}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/config/BlazePersistenceConfigurator.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/config/BlazePersistenceConfigurator.java
deleted file mode 100644
index f618091961..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/config/BlazePersistenceConfigurator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.config;
-
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlMacro;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-
-@ApplicationScoped
-public class BlazePersistenceConfigurator {
-
-    public void observe(@Observes CriteriaBuilderConfiguration config) {
-        config.registerMacro("my_macro", new JpqlMacro() {
-            @Override
-            public void render(FunctionRenderContext context) {
-                context.addArgument(0);
-            }
-        });
-    }
-
-    public void observe(@Observes EntityViewConfiguration config) {
-        config.setOptionalParameter("optionalParameter", "test");
-    }
-
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Document.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Document.java
deleted file mode 100644
index 7addaef1a4..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Document.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Entity
-public class Document implements Serializable {
-
-    private Long id;
-    private String name;
-    private String description;
-    private long age;
-    private Person owner;
-
-    public Document() {
-    }
-
-    public Document(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/DocumentType.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/DocumentType.java
deleted file mode 100644
index e982cef91b..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/DocumentType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Entity
-public class DocumentType {
-    private String id;
-    private String name;
-
-    @Id
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Person.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Person.java
deleted file mode 100644
index 6677382933..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/entity/Person.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.entity;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * @author Christian Beikov
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Entity
-public class Person implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private UUID id;
-    private String name;
-    private long age;
-    private Set<Document> documents = new HashSet<>(0);
-
-    public Person() {
-        id = UUID.randomUUID();
-    }
-
-    public Person(String name) {
-        this();
-        this.name = name;
-    }
-
-    public Person(String name, long age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    @Id
-    @Column(length = 16)
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    @Basic(optional = false)
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @OneToMany(mappedBy = "owner")
-    public Set<Document> getDocuments() {
-        return documents;
-    }
-
-    public void setDocuments(Set<Document> documents) {
-        this.documents = documents;
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentResource.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentResource.java
deleted file mode 100644
index ffcf802522..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentResource.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.resource;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.examples.quarkus.base.entity.Document;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentUpdateView;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentView;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentWithJsonIgnoredNameView;
-import com.blazebit.persistence.integration.jaxrs.EntityViewId;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.net.URI;
-import java.util.List;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Path("documents")
-public class DocumentResource {
-
-    @Inject
-    private EntityManager em;
-    @Inject
-    private EntityViewManager evm;
-    @Inject
-    private CriteriaBuilderFactory cbf;
-
-    @Transactional
-    @PUT
-    @Path("{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public DocumentView updateDocument(@EntityViewId("id") DocumentUpdateView documentUpdateView) {
-        evm.save(em, documentUpdateView);
-        return evm.find(em, DocumentView.class, documentUpdateView.getId());
-    }
-
-    @POST
-    @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response addDocument(DocumentUpdateView view) {
-        evm.save(em, view);
-        return Response.created(URI.create("/documents/" + view.getId())).build();
-    }
-
-
-    @GET
-    @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public List<DocumentView> getDocuments(@QueryParam("age") List<Long> ages) {
-        CriteriaBuilder<Document> cb = cbf.create(em, Document.class).where("age").in().fromValues(Long.class, "age", ages).end();
-        return evm.applySetting(EntityViewSetting.create(DocumentView.class), cb).getResultList();
-    }
-
-    @GET
-    @Transactional
-    @Produces("application/vnd.blazebit.noname+json")
-    public List<DocumentWithJsonIgnoredNameView> getDocumentsWithJsonIgnoredName(@QueryParam("age") List<Long> ages) {
-        CriteriaBuilder<Document> cb = cbf.create(em, Document.class).where("age").in().fromValues(Long.class, "age", ages).end();
-        return evm.applySetting(EntityViewSetting.create(DocumentWithJsonIgnoredNameView.class), cb).getResultList();
-    }
-
-    @DELETE
-    @Transactional
-    public Response clearDocuments() {
-        cbf.delete(em, Document.class).executeUpdate();
-        return Response.ok().build();
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentTypeResource.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentTypeResource.java
deleted file mode 100644
index 1061cfe466..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/DocumentTypeResource.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.resource;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.examples.quarkus.base.entity.DocumentType;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentTypeCreateView;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentTypeUpdateView;
-import com.blazebit.persistence.examples.quarkus.base.view.DocumentTypeView;
-import com.blazebit.persistence.integration.jaxrs.EntityViewId;
-import com.blazebit.persistence.view.EntityViewManager;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.net.URI;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Path("document-types")
-public class DocumentTypeResource {
-
-    @Inject
-    private EntityManager em;
-    @Inject
-    private EntityViewManager evm;
-    @Inject
-    private CriteriaBuilderFactory cbf;
-
-    @Transactional
-    @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response createDocumentType(DocumentTypeCreateView documentTypeCreateView) {
-        evm.save(em, documentTypeCreateView);
-        return Response.created(URI.create("/document-types/" + documentTypeCreateView.getId())).build();
-    }
-
-    @Transactional
-    @PUT
-    @Path("{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public DocumentTypeView updateDocumentType(@EntityViewId("id") DocumentTypeUpdateView documentTypeUpdateView) {
-        evm.save(em, documentTypeUpdateView);
-        return evm.find(em, DocumentTypeView.class, documentTypeUpdateView.getId());
-    }
-
-    @DELETE
-    @Transactional
-    public Response clearDocumentTypes() {
-        cbf.delete(em, DocumentType.class).executeUpdate();
-        return Response.ok().build();
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/PersonResource.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/PersonResource.java
deleted file mode 100644
index 6ba1721b9e..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/resource/PersonResource.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.resource;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.examples.quarkus.base.entity.Person;
-import com.blazebit.persistence.examples.quarkus.base.view.PersonCreateView;
-import com.blazebit.persistence.examples.quarkus.base.view.PersonUpdateView;
-import com.blazebit.persistence.examples.quarkus.base.view.PersonView;
-import com.blazebit.persistence.integration.jaxrs.EntityViewId;
-import com.blazebit.persistence.view.EntityViewManager;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.net.URI;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Path("persons")
-public class PersonResource {
-
-    @Inject
-    private EntityManager em;
-    @Inject
-    private EntityViewManager evm;
-    @Inject
-    private CriteriaBuilderFactory cbf;
-
-    @Transactional
-    @PUT
-    @Path("{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public PersonView updatePerson(@EntityViewId("id") PersonUpdateView personUpdateView) {
-        evm.save(em, personUpdateView);
-        return evm.find(em, PersonView.class, personUpdateView.getId());
-    }
-
-    @POST
-    @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response addPerson(PersonCreateView view) {
-        evm.save(em, view);
-        return Response.created(URI.create("/persons/" + view.getId())).build();
-    }
-
-    @DELETE
-    @Transactional
-    public Response clearPersons() {
-        cbf.delete(em, Person.class).executeUpdate();
-        return Response.ok().build();
-    }
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeCreateView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeCreateView.java
deleted file mode 100644
index 85df711659..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeCreateView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.DocumentType;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@CreatableEntityView
-@EntityView(DocumentType.class)
-public interface DocumentTypeCreateView extends DocumentTypeView {
-    void setId(String id);
-
-    void setName(String name);
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeUpdateView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeUpdateView.java
deleted file mode 100644
index 4efcd1d25b..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeUpdateView.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.DocumentType;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.UpdatableEntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@UpdatableEntityView
-@EntityView(DocumentType.class)
-public interface DocumentTypeUpdateView extends DocumentTypeView {
-    void setName(String name);
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeView.java
deleted file mode 100644
index ff76e83553..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentTypeView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.DocumentType;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(DocumentType.class)
-public interface DocumentTypeView {
-    @IdMapping
-    String getId();
-
-    String getName();
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentUpdateView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentUpdateView.java
deleted file mode 100644
index 9df22ecd2f..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentUpdateView.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Document;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-import com.blazebit.persistence.view.UpdatableEntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@UpdatableEntityView
-@CreatableEntityView
-@EntityView(Document.class)
-public interface DocumentUpdateView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-    void setName(String name);
-
-    Long getAge();
-    void setAge(Long age);
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentView.java
deleted file mode 100644
index 1915d3d9fc..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Document;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-import com.blazebit.persistence.view.Mapping;
-import com.blazebit.persistence.view.MappingParameter;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Document.class)
-public interface DocumentView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-
-    PersonView getOwner();
-
-    @Mapping("size(owner.documents)")
-    long getOwnerDocumentCount();
-
-    @MappingParameter("optionalParameter")
-    String getOptionalParameter();
-
-    @Mapping("my_macro(name)")
-    String getMacroName();
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentWithJsonIgnoredNameView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentWithJsonIgnoredNameView.java
deleted file mode 100644
index 459167c31a..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/DocumentWithJsonIgnoredNameView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Document;
-import com.blazebit.persistence.view.EntityView;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Document.class)
-public interface DocumentWithJsonIgnoredNameView extends DocumentView {
-
-    @JsonIgnore
-    String getName();
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonCreateView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonCreateView.java
deleted file mode 100644
index 98ddae855e..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonCreateView.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Person;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-
-import java.util.UUID;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@CreatableEntityView
-@EntityView(Person.class)
-public interface PersonCreateView extends PersonView {
-
-    void setId(UUID id);
-
-    void setName(String name);
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonUpdateView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonUpdateView.java
deleted file mode 100644
index 7aa1b5ec4d..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonUpdateView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Person;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.UpdatableEntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@UpdatableEntityView
-@EntityView(Person.class)
-public interface PersonUpdateView extends PersonView {
-
-    void setName(String name);
-}
diff --git a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonView.java b/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonView.java
deleted file mode 100644
index 13f783ba47..0000000000
--- a/examples/quarkus/base/src/main/java/com/blazebit/persistence/examples/quarkus/base/view/PersonView.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.base.view;
-
-import com.blazebit.persistence.examples.quarkus.base.entity.Person;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-import java.util.UUID;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Person.class)
-public interface PersonView {
-
-    @IdMapping
-    UUID getId();
-
-    String getName();
-}
diff --git a/examples/quarkus/base/src/main/resources/META-INF/beans.xml b/examples/quarkus/base/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 54f7a563dc..0000000000
--- a/examples/quarkus/base/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="annotated"></beans>
\ No newline at end of file
diff --git a/examples/quarkus/pom.xml b/examples/quarkus/pom.xml
deleted file mode 100644
index c492511bfc..0000000000
--- a/examples/quarkus/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>base</module>
-        <module>testsuite</module>
-    </modules>
-
-    <properties>
-        <main.java.version>1.8</main.java.version>
-        <version.jandex>2.1.3.Final</version.jandex>
-        <version.hibernate-orm>5.4.14.Final</version.hibernate-orm>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bom</artifactId>
-                <version>${version.quarkus}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/base/pom.xml b/examples/quarkus/testsuite/base/pom.xml
deleted file mode 100644
index ae73dc3030..0000000000
--- a/examples/quarkus/testsuite/base/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.examples.quarkus.testsuite.base</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${asmVersion}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>${asmVersion}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>postgresql</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-jdbc-postgresql</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                                <quarkus.test.profile>postgresql</quarkus.test.profile>
-                            </systemPropertyVariables>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-jdbc-mysql</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>8.0.23</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                                <quarkus.test.profile>mysql8</quarkus.test.profile>
-                            </systemPropertyVariables>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-jdbc-mssql</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>com.microsoft.sqlserver</groupId>
-                    <artifactId>mssql-jdbc</artifactId>
-                    <version>7.2.2.jre8</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                                <quarkus.test.profile>mssql</quarkus.test.profile>
-                            </systemPropertyVariables>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>recreate-schema</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${skipTests}</skip>
-                                    <mainClass>com.blazebit.persistence.testsuite.base.jpa.SchemaClearer</mainClass>
-                                    <systemProperties>
-                                        <systemProperty>
-                                            <key>jdbc.url</key>
-                                            <value>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.user</key>
-                                            <value>sa</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.password</key>
-                                            <value>Blaze-Persistence</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.driver</key>
-                                            <value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
-                                        </systemProperty>
-                                    </systemProperties>
-                                    <includePluginDependencies>true</includePluginDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-entitymanager</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.microsoft.sqlserver</groupId>
-                                <artifactId>mssql-jdbc</artifactId>
-                                <version>${mssql.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>h2</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-jdbc-h2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-test-h2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                                <quarkus.test.profile>h2</quarkus.test.profile>
-                            </systemPropertyVariables>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-h2</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/h2</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-jdbc-h2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-test-h2</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-h2</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/h2</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/base/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/base/AbstractQuarkusExampleTest.java b/examples/quarkus/testsuite/base/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/base/AbstractQuarkusExampleTest.java
deleted file mode 100644
index 640bd96e38..0000000000
--- a/examples/quarkus/testsuite/base/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/base/AbstractQuarkusExampleTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.testsuite.base;
-
-import io.quarkus.test.common.http.TestHTTPResource;
-import io.restassured.http.ContentType;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.net.URI;
-import java.util.Map;
-import java.util.UUID;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.matchesPattern;
-import static org.hamcrest.core.Is.is;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public abstract class AbstractQuarkusExampleTest {
-
-    @TestHTTPResource
-    protected URI apiBaseUri;
-
-    @AfterEach
-    public void clearData() {
-        given().when().delete("/documents");
-        given().when().delete("/document-types");
-        given().when().delete("/persons");
-    }
-
-    @Test
-    public void createDocument() {
-        given()
-                .body("{\"name\": \"Doc1\", \"age\": 0}")
-                .contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then()
-                .statusCode(201)
-                .header("Location", matchesPattern("http://localhost:" + apiBaseUri.getPort() + "/documents/.*"));
-    }
-
-    @Test
-    public void getDocuments() {
-        given()
-                .body("{\"name\": \"Doc1\", \"age\": 1}")
-                .contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then()
-                .statusCode(201)
-                .header("Location", matchesPattern("http://localhost:" + apiBaseUri.getPort() + "/documents/.*"));
-
-        given()
-                .queryParam("age", 1)
-                .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON)
-                .when().get("/documents")
-                .then()
-                .statusCode(200)
-                .body("size()", is(1));
-    }
-
-    @Test
-    public void getDocumentsWithJsonIgnoredName() {
-        given()
-                .body("{\"name\": \"Doc1\", \"age\": 1}")
-                .contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then()
-                .statusCode(201)
-                .header("Location", matchesPattern("http://localhost:" + apiBaseUri.getPort() + "/documents/.*"));
-
-        Map<String, String> document = given()
-                .queryParam("age", 1)
-                .header(HttpHeaders.ACCEPT, "application/vnd.blazebit.noname+json")
-                .when().get("/documents")
-                .then()
-                .statusCode(200)
-                .body("size()", is(1))
-                .extract().jsonPath().getMap("[0]");
-
-        assertFalse(document.containsKey("name"));
-        assertEquals("test", document.get("optionalParameter"));
-        assertEquals("Doc1", document.get("macroName"));
-    }
-
-    @Test
-    public void updateDocumentType() {
-        given()
-                .body("{\"id\": \"1\", \"name\": \"docType1\"}")
-                .contentType(ContentType.JSON)
-                .when().post("/document-types")
-                .then()
-                .statusCode(201)
-                .header("Location", matchesPattern("http://localhost:" + apiBaseUri.getPort() + "/document-types/1"));
-
-        given()
-                .body("{\"name\": \"docType1-new\"}")
-                .contentType(ContentType.JSON)
-                .when().put("/document-types/1")
-                .then()
-                .statusCode(200)
-                .body("name", is("docType1-new"));
-    }
-
-    @Test
-    public void updatePerson() {
-        UUID personId = UUID.randomUUID();
-        given()
-                .body("{\"id\": \"" + personId + "\", \"name\": \"person1\"}")
-                .contentType(ContentType.JSON)
-                .when().post("/persons")
-                .then()
-                .statusCode(201)
-                .header("Location", matchesPattern("http://localhost:" + apiBaseUri.getPort() + "/persons/" + personId));
-
-        given()
-                .body("{\"name\": \"person1-new\"}")
-                .contentType(ContentType.JSON)
-                .when().put("/persons/" + personId)
-                .then()
-                .statusCode(200)
-                .body("name", is("person1-new"));
-    }
-}
diff --git a/examples/quarkus/testsuite/base/src/test/h2/com/blazebit/examples/quarkus/testsuite/base/TestResources.java b/examples/quarkus/testsuite/base/src/test/h2/com/blazebit/examples/quarkus/testsuite/base/TestResources.java
deleted file mode 100644
index 7cd5432a98..0000000000
--- a/examples/quarkus/testsuite/base/src/test/h2/com/blazebit/examples/quarkus/testsuite/base/TestResources.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.examples.quarkus.testsuite.base;
-
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@QuarkusTestResource(H2DatabaseTestResource.class)
-public class TestResources {
-}
diff --git a/examples/quarkus/testsuite/base/src/test/java/com/blazebit/examples/quarkus/testsuite/base/QuarkusExampleTest.java b/examples/quarkus/testsuite/base/src/test/java/com/blazebit/examples/quarkus/testsuite/base/QuarkusExampleTest.java
deleted file mode 100644
index 818d86493d..0000000000
--- a/examples/quarkus/testsuite/base/src/test/java/com/blazebit/examples/quarkus/testsuite/base/QuarkusExampleTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.examples.quarkus.testsuite.base;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.junit.QuarkusTest;
-
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@QuarkusTest
-public class QuarkusExampleTest extends AbstractQuarkusExampleTest {
-
-}
diff --git a/examples/quarkus/testsuite/base/src/test/resources/application.properties b/examples/quarkus/testsuite/base/src/test/resources/application.properties
deleted file mode 100644
index ad6627ab56..0000000000
--- a/examples/quarkus/testsuite/base/src/test/resources/application.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-dbHost=localhost
-
-%postgresql.quarkus.datasource.db-kind=postgresql
-%postgresql.quarkus.datasource.username=postgres
-%postgresql.quarkus.datasource.password=postgres
-%postgresql.quarkus.datasource.jdbc.url=jdbc:postgresql://${dbHost}:5432/test
-
-%h2.quarkus.datasource.db-kind=h2
-%h2.quarkus.datasource.username=username-default
-%h2.quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
-
-%mysql8.quarkus.datasource.db-kind=mysql
-%mysql8.quarkus.datasource.username=root
-%mysql8.quarkus.datasource.jdbc.url=jdbc:mysql://${dbHost}:3306/test?useUnicode=true&characterEncoding=utf8&databaseTerm=schema&nullDatabaseMeansCurrent=true
-%mysql8.quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect
-
-%mssql.quarkus.datasource.db-kind=mssql
-%mssql.quarkus.datasource.username=sa
-%mssql.quarkus.datasource.password=Blaze-Persistence
-%mssql.quarkus.datasource.jdbc.url=jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true
-%mssql.quarkus.hibernate-orm.database.generation=create
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
diff --git a/examples/quarkus/testsuite/native/db2/pom.xml b/examples/quarkus/testsuite/native/db2/pom.xml
deleted file mode 100644
index 02049b5d2e..0000000000
--- a/examples/quarkus/testsuite/native/db2/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native-db2</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.quarkustestsuitenativedb2</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-db2</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${version.quarkus}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner${runnerExtension}</native.image.path>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/db2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativedb2/Dummy.java b/examples/quarkus/testsuite/native/db2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativedb2/Dummy.java
deleted file mode 100644
index 00aa08bce4..0000000000
--- a/examples/quarkus/testsuite/native/db2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativedb2/Dummy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.testsuite.nativedb2;
-
-/**
- * Newer Javadoc versions don't package empty javadocs anymore.
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class Dummy {
-
-}
diff --git a/examples/quarkus/testsuite/native/db2/src/main/resources/application.properties b/examples/quarkus/testsuite/native/db2/src/main/resources/application.properties
deleted file mode 100644
index 836a3c25ec..0000000000
--- a/examples/quarkus/testsuite/native/db2/src/main/resources/application.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-quarkus.datasource.db-kind=db2
-quarkus.datasource.username=db2inst1
-quarkus.datasource.password=db2inst1-pwd
-quarkus.datasource.jdbc.url=jdbc:db2://localhost:50000/test
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
-
-quarkus.native.native-image-xmx=4g
diff --git a/examples/quarkus/testsuite/native/db2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/db2/QuarkusExampleIT.java b/examples/quarkus/testsuite/native/db2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/db2/QuarkusExampleIT.java
deleted file mode 100644
index 28847d5284..0000000000
--- a/examples/quarkus/testsuite/native/db2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/db2/QuarkusExampleIT.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.testsuite.db2;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.junit.NativeImageTest;
-
-/**
- * @author Christian Beikov
- * @since 1.6.0
- */
-@NativeImageTest
-public class QuarkusExampleIT extends AbstractQuarkusExampleTest {
-}
diff --git a/examples/quarkus/testsuite/native/h2/pom.xml b/examples/quarkus/testsuite/native/h2/pom.xml
deleted file mode 100644
index 0e2c04408f..0000000000
--- a/examples/quarkus/testsuite/native/h2/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native-h2</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.quarkustestsuitenativeh2</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-h2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${version.quarkus}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner${runnerExtension}</native.image.path>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/h2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativeh2/Dummy.java b/examples/quarkus/testsuite/native/h2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativeh2/Dummy.java
deleted file mode 100644
index d508a27a4c..0000000000
--- a/examples/quarkus/testsuite/native/h2/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativeh2/Dummy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.testsuite.nativeh2;
-
-/**
- * Newer Javadoc versions don't package empty javadocs anymore.
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class Dummy {
-
-}
diff --git a/examples/quarkus/testsuite/native/h2/src/main/resources/application.properties b/examples/quarkus/testsuite/native/h2/src/main/resources/application.properties
deleted file mode 100644
index e272bd030a..0000000000
--- a/examples/quarkus/testsuite/native/h2/src/main/resources/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.username=username-default
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
-
-quarkus.native.native-image-xmx=4g
diff --git a/examples/quarkus/testsuite/native/h2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/h2/QuarkusExampleIT.java b/examples/quarkus/testsuite/native/h2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/h2/QuarkusExampleIT.java
deleted file mode 100644
index 1f7d43e767..0000000000
--- a/examples/quarkus/testsuite/native/h2/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/h2/QuarkusExampleIT.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.testsuite.h2;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.junit.NativeImageTest;
-import io.quarkus.test.h2.H2DatabaseTestResource;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@QuarkusTestResource(H2DatabaseTestResource.class)
-@NativeImageTest
-public class QuarkusExampleIT extends AbstractQuarkusExampleTest {
-}
diff --git a/examples/quarkus/testsuite/native/mssql/pom.xml b/examples/quarkus/testsuite/native/mssql/pom.xml
deleted file mode 100644
index 4fd061162f..0000000000
--- a/examples/quarkus/testsuite/native/mssql/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native-mssql</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.quarkustestsuitenativemssql</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-mssql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>7.2.2.jre8</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>recreate-schema</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipTests}</skip>
-                            <mainClass>com.blazebit.persistence.testsuite.base.jpa.SchemaClearer</mainClass>
-                            <systemProperties>
-                                <systemProperty>
-                                    <key>jdbc.url</key>
-                                    <value>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</value>
-                                </systemProperty>
-                                <systemProperty>
-                                    <key>jdbc.user</key>
-                                    <value>sa</value>
-                                </systemProperty>
-                                <systemProperty>
-                                    <key>jdbc.password</key>
-                                    <value>Blaze-Persistence</value>
-                                </systemProperty>
-                                <systemProperty>
-                                    <key>jdbc.driver</key>
-                                    <value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
-                                </systemProperty>
-                            </systemProperties>
-                            <includePluginDependencies>true</includePluginDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-entitymanager</artifactId>
-                        <version>${version.hibernate-4.3}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.microsoft.sqlserver</groupId>
-                        <artifactId>mssql-jdbc</artifactId>
-                        <version>${mssql.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${version.quarkus}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner${runnerExtension}</native.image.path>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/mssql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemssql/Dummy.java b/examples/quarkus/testsuite/native/mssql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemssql/Dummy.java
deleted file mode 100644
index bb069842d1..0000000000
--- a/examples/quarkus/testsuite/native/mssql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemssql/Dummy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.testsuite.nativemssql;
-
-/**
- * Newer Javadoc versions don't package empty javadocs anymore.
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class Dummy {
-
-}
diff --git a/examples/quarkus/testsuite/native/mssql/src/main/resources/application.properties b/examples/quarkus/testsuite/native/mssql/src/main/resources/application.properties
deleted file mode 100644
index e681f41e36..0000000000
--- a/examples/quarkus/testsuite/native/mssql/src/main/resources/application.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-quarkus.datasource.db-kind=mssql
-quarkus.datasource.username=sa
-quarkus.datasource.password=Blaze-Persistence
-quarkus.datasource.jdbc.url=jdbc:sqlserver://localhost:1433;trustServerCertificate=true
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
-
-quarkus.native.native-image-xmx=4g
diff --git a/examples/quarkus/testsuite/native/mssql/src/test/java/com/blazebit/persistence/examples/testsuite/mssql/QuarkusExampleIT.java b/examples/quarkus/testsuite/native/mssql/src/test/java/com/blazebit/persistence/examples/testsuite/mssql/QuarkusExampleIT.java
deleted file mode 100644
index 35e3cbe154..0000000000
--- a/examples/quarkus/testsuite/native/mssql/src/test/java/com/blazebit/persistence/examples/testsuite/mssql/QuarkusExampleIT.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.testsuite.mssql;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.junit.NativeImageTest;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@NativeImageTest
-public class QuarkusExampleIT extends AbstractQuarkusExampleTest {
-}
diff --git a/examples/quarkus/testsuite/native/mysql/pom.xml b/examples/quarkus/testsuite/native/mysql/pom.xml
deleted file mode 100644
index d413ffa7c8..0000000000
--- a/examples/quarkus/testsuite/native/mysql/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native-mysql</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.quarkustestsuitenativemysql</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-mysql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.23</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${version.quarkus}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner${runnerExtension}</native.image.path>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/mysql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemysql/Dummy.java b/examples/quarkus/testsuite/native/mysql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemysql/Dummy.java
deleted file mode 100644
index 9898f6b092..0000000000
--- a/examples/quarkus/testsuite/native/mysql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativemysql/Dummy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.testsuite.nativemysql;
-
-/**
- * Newer Javadoc versions don't package empty javadocs anymore.
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class Dummy {
-
-}
diff --git a/examples/quarkus/testsuite/native/mysql/src/main/resources/application.properties b/examples/quarkus/testsuite/native/mysql/src/main/resources/application.properties
deleted file mode 100644
index ff8fe4573e..0000000000
--- a/examples/quarkus/testsuite/native/mysql/src/main/resources/application.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-quarkus.datasource.db-kind=mysql
-quarkus.datasource.username=root
-quarkus.datasource.jdbc.url=jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8
-quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
-
-quarkus.native.native-image-xmx=4g
diff --git a/examples/quarkus/testsuite/native/mysql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/mysql/QuarkusExampleIT.java b/examples/quarkus/testsuite/native/mysql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/mysql/QuarkusExampleIT.java
deleted file mode 100644
index 877b101cf3..0000000000
--- a/examples/quarkus/testsuite/native/mysql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/mysql/QuarkusExampleIT.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.testsuite.mysql;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.junit.NativeImageTest;
-import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Test;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.matchesPattern;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@NativeImageTest
-public class QuarkusExampleIT extends AbstractQuarkusExampleTest {
-}
diff --git a/examples/quarkus/testsuite/native/pom.xml b/examples/quarkus/testsuite/native/pom.xml
deleted file mode 100644
index aaa5f96fdd..0000000000
--- a/examples/quarkus/testsuite/native/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-    <packaging>pom</packaging>
-
-    <profiles>
-        <profile>
-            <id>postgresql</id>
-            <modules>
-                <module>postgresql</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>h2</id>
-            <modules>
-                <module>h2</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <modules>
-                <module>mysql</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <modules>
-                <module>mssql</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <modules>
-                <module>db2</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <modules>
-                <module>postgresql</module>
-                <module>h2</module>
-                <module>mysql</module>
-                <module>mssql</module>
-                <module>db2</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>windows</id>
-            <activation>
-                <os><family>windows</family></os>
-            </activation>
-            <properties>
-                <runnerExtension>.exe</runnerExtension>
-            </properties>
-        </profile>
-    </profiles>
-
-    <properties>
-        <quarkus.package.type>native</quarkus.package.type>
-        <runnerExtension />
-        <skipITs />
-    </properties>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/postgresql/pom.xml b/examples/quarkus/testsuite/native/postgresql/pom.xml
deleted file mode 100644
index d7b728455a..0000000000
--- a/examples/quarkus/testsuite/native/postgresql/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus-testsuite-native</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite-native-postgresql</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.quarkustestsuitenativepostgresql</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-examples-quarkus-testsuite-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.18</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${version.quarkus}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner${runnerExtension}</native.image.path>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} { }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/postgresql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativepostgresql/Dummy.java b/examples/quarkus/testsuite/native/postgresql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativepostgresql/Dummy.java
deleted file mode 100644
index fcf048fcae..0000000000
--- a/examples/quarkus/testsuite/native/postgresql/src/main/java/com/blazebit/persistence/examples/quarkus/testsuite/nativepostgresql/Dummy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.quarkus.testsuite.nativepostgresql;
-
-/**
- * Newer Javadoc versions don't package empty javadocs anymore.
- *
- * @author Christian Beikov
- * @since 1.6.0
- */
-public class Dummy {
-
-}
diff --git a/examples/quarkus/testsuite/native/postgresql/src/main/resources/application.properties b/examples/quarkus/testsuite/native/postgresql/src/main/resources/application.properties
deleted file mode 100644
index 2fe15506be..0000000000
--- a/examples/quarkus/testsuite/native/postgresql/src/main/resources/application.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-quarkus.datasource.db-kind=postgresql
-quarkus.datasource.username=postgres
-quarkus.datasource.password=postgres
-quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/test
-
-quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-orm.log.sql=false
-
-quarkus.native.native-image-xmx=4g
\ No newline at end of file
diff --git a/examples/quarkus/testsuite/native/postgresql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/postgresql/QuarkusExampleIT.java b/examples/quarkus/testsuite/native/postgresql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/postgresql/QuarkusExampleIT.java
deleted file mode 100644
index 952150e5dc..0000000000
--- a/examples/quarkus/testsuite/native/postgresql/src/test/java/com/blazebit/persistence/examples/quarkus/testsuite/postgresql/QuarkusExampleIT.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.examples.quarkus.testsuite.postgresql;
-
-import com.blazebit.persistence.examples.quarkus.testsuite.base.AbstractQuarkusExampleTest;
-import io.quarkus.test.junit.NativeImageTest;
-import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Test;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.matchesPattern;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@NativeImageTest
-public class QuarkusExampleIT extends AbstractQuarkusExampleTest {
-}
diff --git a/examples/quarkus/testsuite/pom.xml b/examples/quarkus/testsuite/pom.xml
deleted file mode 100644
index 8046c2455b..0000000000
--- a/examples/quarkus/testsuite/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-examples-quarkus</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-examples-quarkus-testsuite</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>base</module>
-    </modules>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <modules>
-                <module>native</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <modules>
-                <module>base</module>
-                <module>native</module>
-            </modules>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/examples/showcase/base/pom.xml b/examples/showcase/base/pom.xml
index 39b4e0a559..98226ddab7 100644
--- a/examples/showcase/base/pom.xml
+++ b/examples/showcase/base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerFactoryHolder.java b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerFactoryHolder.java
index c964a058b8..39658f070d 100644
--- a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerFactoryHolder.java
+++ b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerFactoryHolder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.showcase.base.bean;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Christian Beikov
diff --git a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerHolder.java b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerHolder.java
index e8c533efdd..df3985996c 100644
--- a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerHolder.java
+++ b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/bean/EntityManagerHolder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.showcase.base.bean;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/model/Cat.java b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/model/Cat.java
index 9abc95ee51..1c8e7eaf29 100644
--- a/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/model/Cat.java
+++ b/examples/showcase/base/src/main/java/com/blazebit/persistence/examples/showcase/base/model/Cat.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.examples.showcase.base.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import java.util.Set;
 
 /**
diff --git a/examples/showcase/fragments/basic/pom.xml b/examples/showcase/fragments/basic/pom.xml
index 46f2384438..6a0f2aacfa 100644
--- a/examples/showcase/fragments/basic/pom.xml
+++ b/examples/showcase/fragments/basic/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,9 +21,28 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -54,70 +73,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/BasicShowcase.java b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/BasicShowcase.java
index a9261db4a5..3a696362bf 100644
--- a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/BasicShowcase.java
+++ b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/BasicShowcase.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.view.EntityViewSetting;
 import com.blazebit.persistence.view.Sorters;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/CatDataAccess.java b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/CatDataAccess.java
index 2e7cd9d205..59d720388d 100644
--- a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/CatDataAccess.java
+++ b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/CatDataAccess.java
@@ -14,8 +14,8 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
 
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 import java.util.List;
 
 /**
diff --git a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/TestDataGenerator.java b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/TestDataGenerator.java
index 8b0c783693..f0e60ae1da 100644
--- a/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/TestDataGenerator.java
+++ b/examples/showcase/fragments/basic/src/main/java/com/blazebit/persistence/examples/showcase/fragments/basic/data/TestDataGenerator.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerHolder;
 import com.blazebit.persistence.examples.showcase.base.model.Cat;
 
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/cte/pom.xml b/examples/showcase/fragments/cte/pom.xml
index 297d4ea0e5..c40fcb3a5f 100644
--- a/examples/showcase/fragments/cte/pom.xml
+++ b/examples/showcase/fragments/cte/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,9 +21,28 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -54,70 +73,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CTEShowcase.java b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CTEShowcase.java
index 12bb125f01..450092d157 100644
--- a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CTEShowcase.java
+++ b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CTEShowcase.java
@@ -14,7 +14,7 @@
 import com.blazebit.persistence.examples.showcase.spi.AbstractShowcase;
 import com.blazebit.persistence.view.EntityViewSetting;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CatHierarchyCTE.java b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CatHierarchyCTE.java
index 4c880b535d..b99f2eec71 100644
--- a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CatHierarchyCTE.java
+++ b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/CatHierarchyCTE.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.CTE;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/CatDataAccess.java b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/CatDataAccess.java
index 0a6e40bb5a..b7fa526b35 100644
--- a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/CatDataAccess.java
+++ b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/CatDataAccess.java
@@ -15,9 +15,9 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
 
-import javax.inject.Inject;
-import javax.persistence.Tuple;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Tuple;
+import jakarta.transaction.Transactional;
 import java.util.List;
 
 /**
diff --git a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/TestDataGenerator.java b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/TestDataGenerator.java
index ab5a13639f..3e86de05cd 100644
--- a/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/TestDataGenerator.java
+++ b/examples/showcase/fragments/cte/src/main/java/com/blazebit/persistence/examples/showcase/fragments/cte/data/TestDataGenerator.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerHolder;
 import com.blazebit.persistence.examples.showcase.base.model.Cat;
 
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/pom.xml b/examples/showcase/fragments/pom.xml
index 3f4275477a..2e91ab83a6 100644
--- a/examples/showcase/fragments/pom.xml
+++ b/examples/showcase/fragments/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/fragments/spring-data/pom.xml b/examples/showcase/fragments/spring-data/pom.xml
index a42932d781..99efa39b56 100644
--- a/examples/showcase/fragments/spring-data/pom.xml
+++ b/examples/showcase/fragments/spring-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,8 +14,7 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.showcase.fragments.spring.data</module.name>
-        <version.spring>4.3.3.RELEASE</version.spring>
-        <version.spring.boot>1.4.1.RELEASE</version.spring.boot>
+        <version.spring>${version.spring-data-latest-spring}</version.spring>
     </properties>
 
     <dependencyManagement>
@@ -32,9 +31,28 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -51,24 +69,14 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>javax.inject</groupId>-->
-            <!--<artifactId>javax.inject</artifactId>-->
-            <!--<version>1</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>javax.transaction</groupId>-->
-            <!--<artifactId>javax.transaction-api</artifactId>-->
-            <!--<version>1.2</version>-->
-        <!--</dependency>-->
 
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-1.x}</version>
+            <version>${version.spring-data-latest}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -87,70 +95,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/SpringDataShowcase.java b/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/SpringDataShowcase.java
index 2366b2f843..9767e4ae07 100644
--- a/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/SpringDataShowcase.java
+++ b/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/SpringDataShowcase.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.examples.showcase.fragments.spring.data.repository.CatRepository;
 import com.blazebit.persistence.examples.showcase.spi.AbstractShowcase;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/data/TestDataGenerator.java b/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/data/TestDataGenerator.java
index 2d6acbeaab..5ef2d8ccbd 100644
--- a/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/data/TestDataGenerator.java
+++ b/examples/showcase/fragments/spring-data/src/main/java/com/blazebit/persistence/examples/showcase/fragments/spring/data/data/TestDataGenerator.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerHolder;
 import com.blazebit.persistence.examples.showcase.base.model.Cat;
 
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml
index 7cba976a8a..635f6f0714 100644
--- a/examples/showcase/pom.xml
+++ b/examples/showcase/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/runner/cdi/pom.xml b/examples/showcase/runner/cdi/pom.xml
index dde1adb9a2..98b619927e 100644
--- a/examples/showcase/runner/cdi/pom.xml
+++ b/examples/showcase/runner/cdi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-runner</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.showcase.runner.cdi</module.name>
-        <version.deltaspike>${version.deltaspike-1.9}</version.deltaspike>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
     </properties>
 
     <dependencyManagement>
@@ -34,11 +34,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
@@ -67,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -84,18 +104,6 @@
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
             <version>${version.weld}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>${version.jandex}</version>
         </dependency>
 
         <dependency>
@@ -140,9 +148,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.2}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-6.6}</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -158,13 +166,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jta}</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Test dependencies -->
 
         <!-- include all showcases -->
@@ -198,32 +199,18 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
 
     <profiles>
         <profile>
-            <id>deltaspike-1.7</id>
-            <properties>
-                <version.weld>2.4.5.Final</version.weld>
-                <version.deltaspike>${version.deltaspike-1.7}</version.deltaspike>
-            </properties>
-        </profile>
-        <profile>
-            <id>deltaspike-1.8</id>
-            <properties>
-                <version.weld>2.4.5.Final</version.weld>
-                <version.deltaspike>${version.deltaspike-1.8}</version.deltaspike>
-            </properties>
-        </profile>
-        <profile>
-            <id>deltaspike-1.9</id>
+            <id>deltaspike-2.0</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.deltaspike>${version.deltaspike-1.9}</version.deltaspike>
+                <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
             </properties>
         </profile>
         <profile>
@@ -248,48 +235,6 @@
         </profile>
 
         <!-- skip tests for non-hibernate profiles -->
-        <profile>
-            <id>datanucleus-4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>eclipselink</id>
             <build>
@@ -304,30 +249,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>openjpa</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>post-10</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
\ No newline at end of file
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseRunner.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseRunner.java
index 0698335424..6b347a3034 100644
--- a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseRunner.java
+++ b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseRunner.java
@@ -11,7 +11,7 @@
 import org.apache.deltaspike.cdise.api.ContextControl;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerFactoryHolderImpl.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerFactoryHolderImpl.java
index ec374b89d3..3be2c0c9e9 100644
--- a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerFactoryHolderImpl.java
+++ b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerFactoryHolderImpl.java
@@ -7,12 +7,12 @@
 
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerFactoryHolder;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerHolderImpl.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerHolderImpl.java
index 08d4dbd53a..6002c7f963 100644
--- a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerHolderImpl.java
+++ b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/bean/EntityManagerHolderImpl.java
@@ -8,12 +8,12 @@
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerHolder;
 import org.apache.deltaspike.jpa.api.transaction.TransactionScoped;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @TransactionScoped for EntityManager directly
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/producer/BlazePersistenceProducer.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/producer/BlazePersistenceProducer.java
index e8cf68877d..6353418e58 100644
--- a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/producer/BlazePersistenceProducer.java
+++ b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/producer/BlazePersistenceProducer.java
@@ -11,10 +11,10 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/JavaxTransactionalExtension.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/JavaxTransactionalExtension.java
deleted file mode 100644
index 0503a8e11d..0000000000
--- a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/JavaxTransactionalExtension.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.examples.showcase.runner.cdi.transaction;
-
-import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.WithAnnotations;
-import javax.transaction.Transactional;
-
-/**
- * Integrates DeltaSpike's @Transactional feature with javax.transaction.Transactional
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class JavaxTransactionalExtension implements Extension {
-
-    public <T> void onAnnotatedType(@Observes @WithAnnotations(Transactional.class) ProcessAnnotatedType<T> annotatedType) {
-        AnnotatedTypeBuilder<T> builder = new AnnotatedTypeBuilder<T>()
-                .readFromType(annotatedType.getAnnotatedType())
-                .addToClass(AnnotationInstanceProvider.of(org.apache.deltaspike.jpa.api.transaction.Transactional.class));
-        annotatedType.setAnnotatedType(builder.create());
-    }
-
-}
diff --git a/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/TransactionalExtension.java b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/TransactionalExtension.java
new file mode 100644
index 0000000000..09115e05f4
--- /dev/null
+++ b/examples/showcase/runner/cdi/src/main/java/com/blazebit/persistence/examples/showcase/runner/cdi/transaction/TransactionalExtension.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package com.blazebit.persistence.examples.showcase.runner.cdi.transaction;
+
+import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
+
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.WithAnnotations;
+import jakarta.transaction.Transactional;
+
+/**
+ * Integrates DeltaSpike's @Transactional feature with jakarta.transaction.Transactional
+ *
+ * @author Moritz Becker
+ * @since 1.2.0
+ */
+public class TransactionalExtension implements Extension {
+
+    public <T> void onAnnotatedType(@Observes @WithAnnotations(Transactional.class) ProcessAnnotatedType<T> annotatedType) {
+        annotatedType.configureAnnotatedType().add(AnnotationInstanceProvider.of(org.apache.deltaspike.jpa.api.transaction.Transactional.class));
+    }
+
+}
diff --git a/examples/showcase/runner/cdi/src/main/resources/META-INF/persistence.xml b/examples/showcase/runner/cdi/src/main/resources/META-INF/persistence.xml
index 74e4227ba3..c69b33ceaf 100644
--- a/examples/showcase/runner/cdi/src/main/resources/META-INF/persistence.xml
+++ b/examples/showcase/runner/cdi/src/main/resources/META-INF/persistence.xml
@@ -11,12 +11,12 @@
         <mapping-file>META-INF/showcaseEntities.xml</mapping-file>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
-            <property name="javax.persistence.jdbc.user" value="user" />
-            <property name="javax.persistence.jdbc.password" value="password" />
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
+            <property name="jakarta.persistence.jdbc.user" value="user" />
+            <property name="jakarta.persistence.jdbc.password" value="password" />
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
 
-            <property name="javax.persistence.schema-generation.database.action" value="create-drop"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="create-drop"/>
         </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/examples/showcase/runner/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/examples/showcase/runner/cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 95%
rename from examples/showcase/runner/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to examples/showcase/runner/cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
index ea057cd773..5baeb55f64 100644
--- a/examples/showcase/runner/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/examples/showcase/runner/cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-com.blazebit.persistence.examples.showcase.runner.cdi.transaction.JavaxTransactionalExtension
\ No newline at end of file
+com.blazebit.persistence.examples.showcase.runner.cdi.transaction.TransactionalExtension
\ No newline at end of file
diff --git a/examples/showcase/runner/cdi/src/test/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseTest.java b/examples/showcase/runner/cdi/src/test/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseTest.java
index b9a84437b9..a98d554d9e 100644
--- a/examples/showcase/runner/cdi/src/test/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseTest.java
+++ b/examples/showcase/runner/cdi/src/test/java/com/blazebit/persistence/examples/showcase/runner/cdi/CDIShowcaseTest.java
@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.ServiceLoader;
 
 /**
diff --git a/examples/showcase/runner/cdi/src/test/resources/META-INF/beans.xml b/examples/showcase/runner/cdi/src/test/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..5f54e7b69c
--- /dev/null
+++ b/examples/showcase/runner/cdi/src/test/resources/META-INF/beans.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  Copyright Blazebit
+  -->
+<beans
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+    bean-discovery-mode="all"
+    version="1.2">
+</beans>
\ No newline at end of file
diff --git a/examples/showcase/runner/pom.xml b/examples/showcase/runner/pom.xml
index 77a9b612af..5ac4400537 100644
--- a/examples/showcase/runner/pom.xml
+++ b/examples/showcase/runner/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,17 +17,9 @@
     <artifactId>blaze-persistence-examples-showcase-runner</artifactId>
     <packaging>pom</packaging>
 
-    <profiles>
-        <profile>
-            <id>jdk-8</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <modules>
-                <module>cdi</module>
-                <module>spring</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>cdi</module>
+        <module>spring</module>
+    </modules>
 
 </project>
\ No newline at end of file
diff --git a/examples/showcase/runner/spring/pom.xml b/examples/showcase/runner/spring/pom.xml
index ce1dff2917..31ec5586e6 100644
--- a/examples/showcase/runner/spring/pom.xml
+++ b/examples/showcase/runner/spring/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-runner</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.showcase.runner.spring</module.name>
-        <version.spring.boot>1.4.1.RELEASE</version.spring.boot>
+        <version.spring.boot>${version.spring-data-latest-spring-boot}</version.spring.boot>
     </properties>
 
     <dependencyManagement>
@@ -63,11 +63,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -80,9 +80,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.4}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-6.6}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
 
@@ -197,239 +197,23 @@
 
         <!-- skip tests for non-hibernate profiles -->
         <profile>
-            <id>datanucleus-4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseRunner.java b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseRunner.java
index 2412ef043d..83ba0cf434 100644
--- a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseRunner.java
+++ b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseRunner.java
@@ -16,7 +16,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/bean/EntityManagerHolderImpl.java b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/bean/EntityManagerHolderImpl.java
index f3b8132933..60e43e3a7e 100644
--- a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/bean/EntityManagerHolderImpl.java
+++ b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/bean/EntityManagerHolderImpl.java
@@ -8,9 +8,9 @@
 import com.blazebit.persistence.examples.showcase.base.bean.EntityManagerHolder;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PreDestroy;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.annotation.PreDestroy;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/config/BlazePersistenceConfiguration.java b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/config/BlazePersistenceConfiguration.java
index 9a4a575371..8e56edaf3a 100644
--- a/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/config/BlazePersistenceConfiguration.java
+++ b/examples/showcase/runner/spring/src/main/java/com/blazebit/persistence/examples/showcase/runner/spring/config/BlazePersistenceConfiguration.java
@@ -16,8 +16,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Moritz Becker
diff --git a/examples/showcase/runner/spring/src/main/resources/META-INF/persistence.xml b/examples/showcase/runner/spring/src/main/resources/META-INF/persistence.xml
index 4735cc03ff..c327adba78 100644
--- a/examples/showcase/runner/spring/src/main/resources/META-INF/persistence.xml
+++ b/examples/showcase/runner/spring/src/main/resources/META-INF/persistence.xml
@@ -13,12 +13,12 @@
         <mapping-file>META-INF/showcaseEntities.xml</mapping-file>
 
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
-            <property name="javax.persistence.jdbc.user" value="user" />
-            <property name="javax.persistence.jdbc.password" value="password" />
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
+            <property name="jakarta.persistence.jdbc.user" value="user" />
+            <property name="jakarta.persistence.jdbc.password" value="password" />
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
 
-            <property name="javax.persistence.schema-generation.database.action" value="create-drop"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="create-drop"/>
         </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/examples/showcase/runner/spring/src/test/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseTest.java b/examples/showcase/runner/spring/src/test/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseTest.java
index 93e6f9c9e3..a0b571e2d6 100644
--- a/examples/showcase/runner/spring/src/test/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseTest.java
+++ b/examples/showcase/runner/spring/src/test/java/com/blazebit/persistence/examples/showcase/runner/spring/SpringShowcaseTest.java
@@ -18,7 +18,7 @@
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.ServiceLoader;
 
 /**
diff --git a/examples/showcase/spi/pom.xml b/examples/showcase/spi/pom.xml
index a9a7b60ad5..980eb9e0c0 100644
--- a/examples/showcase/spi/pom.xml
+++ b/examples/showcase/spi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/spring-data-dgs/pom.xml b/examples/spring-data-dgs/pom.xml
index 167756e888..1c3bf12fc0 100644
--- a/examples/spring-data-dgs/pom.xml
+++ b/examples/spring-data-dgs/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,9 +20,8 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.data.dgs</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <start-class>com.blazebit.persistence.examples.spring.data.com.blazebit.persistence.integration.graphql.dgs.Application</start-class>
     </properties>
 
@@ -38,7 +37,7 @@
             <dependency>
                 <groupId>com.netflix.graphql.dgs</groupId>
                 <artifactId>graphql-dgs-platform-dependencies</artifactId>
-                <version>4.9.25</version>
+                <version>9.1.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -67,7 +66,7 @@
             <version>${version.spring.boot}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </exclusion>
             </exclusions>
@@ -75,7 +74,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
+            <artifactId>blaze-persistence-integration-graphql-dgs-7.0</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -85,14 +84,20 @@
         <dependency>
             <groupId>com.apollographql.federation</groupId>
             <artifactId>federation-graphql-java-support</artifactId>
-            <version>0.7.0</version>
+            <version>5.2.0</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-        <!-- federation-graphql-java-support requires and specifies 17.3 but due to https://issues.apache.org/jira/browse/MNG-5761 we have to specify it explicitly-->
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>17.3</version>
+            <version>22.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.netflix.graphql.dgs</groupId>
@@ -106,8 +111,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -138,7 +143,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -157,12 +162,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -170,6 +169,39 @@
             <!-- Need this to run the application directly -->
             <scope>runtime</scope>
         </dependency>
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -190,7 +222,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
@@ -208,330 +240,39 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${version.junit-vintage}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- Use Spring Boot 2.3 as a minimum for DGS as it requires Kotlin 1.4 which only works on Spring Boot 2.3 AFAIK -->
         <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -541,35 +282,33 @@
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
                 </dependency>
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hibernate-apt</id>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-apt}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -579,20 +318,18 @@
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
-                    <version>2.10.1</version>
                 </dependency>
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
-                    <version>2.10.1</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -604,70 +341,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/Application.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/Application.java
index 20062a8ad1..2b1e537467 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/Application.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/Application.java
@@ -15,7 +15,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/config/BlazePersistenceConfiguration.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/config/BlazePersistenceConfiguration.java
index bf337746d3..8439b422fa 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Cat.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Cat.java
index d26d7344e3..43e28c79b7 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Cat.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Cat.java
@@ -8,13 +8,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/ListStringConverter.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/ListStringConverter.java
index aec4dcc5ad..d246f7d149 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/ListStringConverter.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/ListStringConverter.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.spring.data.dgs.model;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Person.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Person.java
index e421d59930..ed3c959b63 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Person.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.data.dgs.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/repository/CatViewRepository.java b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/repository/CatViewRepository.java
index 6d622f6eed..3f127f994b 100644
--- a/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/repository/CatViewRepository.java
+++ b/examples/spring-data-dgs/src/main/java/com/blazebit/persistence/examples/spring/data/dgs/repository/CatViewRepository.java
@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/examples/spring-data-dgs/src/test/java/com/blazebit/persistence/examples/spring/data/dgs/repository/AbstractSampleTest.java b/examples/spring-data-dgs/src/test/java/com/blazebit/persistence/examples/spring/data/dgs/repository/AbstractSampleTest.java
index cf227dd492..b55dd21827 100644
--- a/examples/spring-data-dgs/src/test/java/com/blazebit/persistence/examples/spring/data/dgs/repository/AbstractSampleTest.java
+++ b/examples/spring-data-dgs/src/test/java/com/blazebit/persistence/examples/spring/data/dgs/repository/AbstractSampleTest.java
@@ -12,7 +12,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-graphql/pom.xml b/examples/spring-data-graphql/pom.xml
index 7e0a358763..3e3f1febed 100644
--- a/examples/spring-data-graphql/pom.xml
+++ b/examples/spring-data-graphql/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,9 +20,8 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.data.graphql</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <start-class>com.blazebit.persistence.examples.spring.data.graphql.Application</start-class>
     </properties>
 
@@ -60,7 +59,7 @@
             <version>${version.spring.boot}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </exclusion>
             </exclusions>
@@ -74,7 +73,7 @@
         <dependency>
             <groupId>com.graphql-java-kickstart</groupId>
             <artifactId>graphql-spring-boot-starter</artifactId>
-            <version>12.0.0</version>
+            <version>15.1.0</version>
             <exclusions>
                 <!--provided actuator version doesn't work with some of the older spring-data profiles-->
                 <exclusion>
@@ -90,8 +89,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -122,7 +121,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -141,12 +140,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -154,6 +147,39 @@
             <!-- Need this to run the application directly -->
             <scope>runtime</scope>
         </dependency>
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -174,7 +200,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
@@ -199,306 +225,39 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${version.junit-vintage}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- Use Spring Boot 2.0 as a minimum version because 1.* is no longer compatible with newer versions of graphql-spring-boot-starter -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.1-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>2.0.1.Final</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>2.0.1.Final</version>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.12.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>2.0.1.Final</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                    <version>2.13.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>2.0.1.Final</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -508,35 +267,33 @@
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
-                    <version>2.13.3</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>2.0.1.Final</version>
+                    <groupId>jakarta.validation</groupId>
+                    <artifactId>jakarta.validation-api</artifactId>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hibernate-apt</id>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -546,15 +303,18 @@
                 <dependency>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
-                    <version>2.13.3</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.validation</groupId>
+                    <artifactId>jakarta.validation-api</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -566,70 +326,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/Application.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/Application.java
index 36fb250de8..0449627c1d 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/Application.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/Application.java
@@ -15,7 +15,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/GraphQLProvider.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/GraphQLProvider.java
index 7887b9a75f..cb7760d2a5 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/GraphQLProvider.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/GraphQLProvider.java
@@ -28,7 +28,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.FileCopyUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collections;
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/config/BlazePersistenceConfiguration.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/config/BlazePersistenceConfiguration.java
index 4452c0df06..c089a50ad5 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Cat.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Cat.java
index 1000e08f33..e84e8e0fe0 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Cat.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Cat.java
@@ -8,13 +8,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/ListStringConverter.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/ListStringConverter.java
index c0c2288c30..7081eeb993 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/ListStringConverter.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/ListStringConverter.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.spring.data.graphql.model;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Person.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Person.java
index 448001f467..b14ba87a4c 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Person.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.data.graphql.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/repository/CatViewRepository.java b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/repository/CatViewRepository.java
index 8afc2d095c..6f2e74d5bc 100644
--- a/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/repository/CatViewRepository.java
+++ b/examples/spring-data-graphql/src/main/java/com/blazebit/persistence/examples/spring/data/graphql/repository/CatViewRepository.java
@@ -12,7 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/examples/spring-data-graphql/src/test/java/com/blazebit/persistence/examples/spring/data/graphql/repository/AbstractSampleTest.java b/examples/spring-data-graphql/src/test/java/com/blazebit/persistence/examples/spring/data/graphql/repository/AbstractSampleTest.java
index c54cb68418..ee4d25ddcd 100644
--- a/examples/spring-data-graphql/src/test/java/com/blazebit/persistence/examples/spring/data/graphql/repository/AbstractSampleTest.java
+++ b/examples/spring-data-graphql/src/test/java/com/blazebit/persistence/examples/spring/data/graphql/repository/AbstractSampleTest.java
@@ -12,7 +12,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-spqr/pom.xml b/examples/spring-data-spqr/pom.xml
index aee45750d0..97bef680ba 100644
--- a/examples/spring-data-spqr/pom.xml
+++ b/examples/spring-data-spqr/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,10 +20,9 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.data.spqr</module.name>
-        <main.java.version>1.8</main.java.version>
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-        <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+        <version.spring>${version.spring-data-latest-spring}</version.spring>
+        <version.spring.boot>${version.spring-data-latest-spring-boot}</version.spring.boot>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <start-class>com.blazebit.persistence.examples.spring.data.spqr.Application</start-class>
     </properties>
 
@@ -43,7 +42,7 @@
         <dependency>
             <groupId>io.leangen.graphql</groupId>
             <artifactId>graphql-spqr-spring-boot-starter</artifactId>
-            <version>0.0.7</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -66,7 +65,7 @@
             <version>${version.spring.boot}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </exclusion>
             </exclusions>
@@ -76,7 +75,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.7}</version>
+            <version>${version.spring-data-3.3}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -85,11 +84,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
         </dependency>
 
         <dependency>
@@ -99,8 +98,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -131,7 +130,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -150,12 +149,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -163,6 +156,39 @@
             <!-- Need this to run the application directly -->
             <scope>runtime</scope>
         </dependency>
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -183,7 +209,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
@@ -208,6 +234,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${version.junit-vintage}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/Application.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/Application.java
index a5f5529f45..8ee6d723d8 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/Application.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/Application.java
@@ -17,7 +17,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/BlazePersistenceConfiguration.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/BlazePersistenceConfiguration.java
index 00de28203b..47a929c31a 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/SpqrConfiguration.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/SpqrConfiguration.java
index 579c2bcaf0..c45a8e8c1f 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/SpqrConfiguration.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/config/SpqrConfiguration.java
@@ -16,7 +16,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Boy.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Boy.java
index 9aceca6f87..3607cbb8bb 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Boy.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Boy.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.spring.data.spqr.model;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class Boy extends Child {
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Cat.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Cat.java
index 2e18fdbff7..bd45b93d3b 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Cat.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Cat.java
@@ -8,13 +8,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Child.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Child.java
index 1dd569f6cc..098bbde051 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Child.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Child.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.examples.spring.data.spqr.model;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.ManyToOne;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Girl.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Girl.java
index 1593b6bec4..35554898bb 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Girl.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Girl.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.spring.data.spqr.model;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class Girl extends Child {
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/ListStringConverter.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/ListStringConverter.java
index c0b2b84603..0c58fa7f2c 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/ListStringConverter.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/ListStringConverter.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.examples.spring.data.spqr.model;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Person.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Person.java
index 661228713b..203081b0ce 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Person.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.data.spqr.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/repository/CatViewRepository.java b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/repository/CatViewRepository.java
index cc77f7d025..e25ad649ba 100644
--- a/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/repository/CatViewRepository.java
+++ b/examples/spring-data-spqr/src/main/java/com/blazebit/persistence/examples/spring/data/spqr/repository/CatViewRepository.java
@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/examples/spring-data-spqr/src/test/java/com/blazebit/persistence/examples/spring/data/spqr/repository/AbstractSampleTest.java b/examples/spring-data-spqr/src/test/java/com/blazebit/persistence/examples/spring/data/spqr/repository/AbstractSampleTest.java
index ee12d9b088..326e2117de 100644
--- a/examples/spring-data-spqr/src/test/java/com/blazebit/persistence/examples/spring/data/spqr/repository/AbstractSampleTest.java
+++ b/examples/spring-data-spqr/src/test/java/com/blazebit/persistence/examples/spring/data/spqr/repository/AbstractSampleTest.java
@@ -14,7 +14,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/examples/spring-data-webflux/pom.xml b/examples/spring-data-webflux/pom.xml
index 46eb0b0461..efa3c0e26e 100644
--- a/examples/spring-data-webflux/pom.xml
+++ b/examples/spring-data-webflux/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,13 +20,12 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.data.webflux</module.name>
-        <main.java.version>1.8</main.java.version>
 
         <start-class>com.blazebit.persistence.examples.spring.data.webflux.Application</start-class>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
-        <version.spring>${version.spring-data-2.0-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
+        <version.spring>${version.spring-data-latest-spring}</version.spring>
+        <version.spring.boot>${version.spring-data-latest-spring-boot}</version.spring.boot>
     </properties>
 
     <dependencyManagement>
@@ -49,8 +48,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -81,7 +80,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -118,16 +117,19 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${version.jaxb-api}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>${version.jaxb}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     
@@ -157,152 +159,20 @@
 
     <profiles>
         <profile>
-            <id>spring-data-2.0.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.1-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
             <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -311,82 +181,26 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hibernate-apt</id>
             <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -395,11 +209,11 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -411,70 +225,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/Application.java b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/Application.java
index 57404c19d0..1268169739 100644
--- a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/Application.java
+++ b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/Application.java
@@ -15,7 +15,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/config/BlazePersistenceConfiguration.java b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/config/BlazePersistenceConfiguration.java
index edb7d48136..ae978a810d 100644
--- a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/controller/CatRestController.java b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/controller/CatRestController.java
index 893417d8a9..305ab39c77 100644
--- a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/controller/CatRestController.java
+++ b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/controller/CatRestController.java
@@ -32,12 +32,12 @@
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Cat.java b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Cat.java
index 6f90d87d7d..afd0e7257a 100644
--- a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Cat.java
+++ b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Cat.java
@@ -8,12 +8,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Person.java b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Person.java
index 1492556953..5b5b5150d3 100644
--- a/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Person.java
+++ b/examples/spring-data-webflux/src/main/java/com/blazebit/persistence/examples/spring/data/webflux/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.data.webflux.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-webflux/src/test/java/com/blazebit/persistence/examples/spring/data/webflux/repository/AbstractSampleTest.java b/examples/spring-data-webflux/src/test/java/com/blazebit/persistence/examples/spring/data/webflux/repository/AbstractSampleTest.java
index 21a99f45b4..e85e442ce1 100644
--- a/examples/spring-data-webflux/src/test/java/com/blazebit/persistence/examples/spring/data/webflux/repository/AbstractSampleTest.java
+++ b/examples/spring-data-webflux/src/test/java/com/blazebit/persistence/examples/spring/data/webflux/repository/AbstractSampleTest.java
@@ -11,7 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-webmvc/pom.xml b/examples/spring-data-webmvc/pom.xml
index ae57603317..17be99685c 100644
--- a/examples/spring-data-webmvc/pom.xml
+++ b/examples/spring-data-webmvc/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,9 +20,8 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.data.webmvc</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <start-class>com.blazebit.persistence.examples.spring.data.webmvc.Application</start-class>
     </properties>
 
@@ -51,8 +50,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -83,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -124,16 +123,19 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${version.jaxb-api}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>${version.jaxb}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     
@@ -163,240 +165,20 @@
 
     <profiles>
         <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-1.x-spring-boot}</version.spring.boot>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.8.9</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.1-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -405,26 +187,26 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hibernate-apt</id>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-apt}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -433,11 +215,11 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -449,70 +231,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/Application.java b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/Application.java
index 434b7f8094..c6cdf44f8b 100644
--- a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/Application.java
+++ b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/Application.java
@@ -16,7 +16,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/config/BlazePersistenceConfiguration.java b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/config/BlazePersistenceConfiguration.java
index 4ec2616ec5..2715d8dadf 100644
--- a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/controller/CatRestController.java b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/controller/CatRestController.java
index 7e9e0585db..bdd5b7392e 100644
--- a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/controller/CatRestController.java
+++ b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/controller/CatRestController.java
@@ -29,12 +29,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Cat.java b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Cat.java
index 2cdab781d2..6e5a11ee66 100644
--- a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Cat.java
+++ b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Cat.java
@@ -8,12 +8,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Person.java b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Person.java
index 797ebc59d4..840e0698c6 100644
--- a/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Person.java
+++ b/examples/spring-data-webmvc/src/main/java/com/blazebit/persistence/examples/spring/data/webmvc/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.data.webmvc.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-data-webmvc/src/test/java/com/blazebit/persistence/examples/spring/data/webmvc/repository/AbstractSampleTest.java b/examples/spring-data-webmvc/src/test/java/com/blazebit/persistence/examples/spring/data/webmvc/repository/AbstractSampleTest.java
index 9548139442..74263b1ef8 100644
--- a/examples/spring-data-webmvc/src/test/java/com/blazebit/persistence/examples/spring/data/webmvc/repository/AbstractSampleTest.java
+++ b/examples/spring-data-webmvc/src/test/java/com/blazebit/persistence/examples/spring/data/webmvc/repository/AbstractSampleTest.java
@@ -12,7 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-hateoas/pom.xml b/examples/spring-hateoas/pom.xml
index 2a9c736302..d061c357ec 100644
--- a/examples/spring-hateoas/pom.xml
+++ b/examples/spring-hateoas/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -20,9 +20,8 @@
 
     <properties>
         <module.name>com.blazebit.persistence.examples.spring.hateoas</module.name>
-        <main.java.version>1.8</main.java.version>
 
-        <version.hibernate>5.0.12.Final</version.hibernate>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
         <start-class>com.blazebit.persistence.examples.spring.hateoas.Application</start-class>
     </properties>
 
@@ -56,8 +55,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
         </dependency>
 
@@ -134,7 +133,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
     
@@ -164,239 +163,20 @@
 
     <profiles>
         <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.4}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.aspectj</groupId>
-                    <artifactId>aspectjweaver</artifactId>
-                    <version>1.9.4</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -405,26 +185,26 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hibernate-apt</id>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+                <version.hibernate>${version.hibernate-apt}</version.hibernate>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.data</groupId>
                     <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
+                    <version>${version.spring-data-3.3}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>
@@ -433,11 +213,11 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -449,70 +229,20 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source-metamodel</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/Application.java b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/Application.java
index c96eca08f6..5ce6d46618 100644
--- a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/Application.java
+++ b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/Application.java
@@ -16,7 +16,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/config/BlazePersistenceConfiguration.java b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/config/BlazePersistenceConfiguration.java
index a770a66434..7dab782b2e 100644
--- a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/config/BlazePersistenceConfiguration.java
+++ b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/config/BlazePersistenceConfiguration.java
@@ -19,8 +19,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/controller/CatRestController.java b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/controller/CatRestController.java
index 08e64c1577..b4257c9df2 100644
--- a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/controller/CatRestController.java
+++ b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/controller/CatRestController.java
@@ -39,12 +39,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Cat.java b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Cat.java
index 6928528079..fa8ceb5fc8 100644
--- a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Cat.java
+++ b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Cat.java
@@ -8,12 +8,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Person.java b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Person.java
index 7ea1eb7edf..d97a427a84 100644
--- a/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Person.java
+++ b/examples/spring-hateoas/src/main/java/com/blazebit/persistence/examples/spring/hateoas/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.examples.spring.hateoas.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/examples/spring-hateoas/src/test/java/com/blazebit/persistence/examples/spring/hateoas/repository/AbstractSampleTest.java b/examples/spring-hateoas/src/test/java/com/blazebit/persistence/examples/spring/hateoas/repository/AbstractSampleTest.java
index 108a0bf7c9..6759eeb998 100644
--- a/examples/spring-hateoas/src/test/java/com/blazebit/persistence/examples/spring/hateoas/repository/AbstractSampleTest.java
+++ b/examples/spring-hateoas/src/test/java/com/blazebit/persistence/examples/spring/hateoas/repository/AbstractSampleTest.java
@@ -12,7 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Christian Beikov
diff --git a/integration/datanucleus-5.1/pom.xml b/integration/datanucleus-5.1/pom.xml
deleted file mode 100644
index 7d9a6e5604..0000000000
--- a/integration/datanucleus-5.1/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration DataNucleus 5.1</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.datanucleus</module.name>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>DataNucleus Nightly</id>
-            <name>DataNucleus Repository Nightly</name>
-            <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.2.0-release</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-core</artifactId>
-            <version>${version.datanucleus.base-5.1}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jpa</artifactId>
-            <version>${version.datanucleus.api-jpa-5.1}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jpa-query</artifactId>
-            <version>${version.datanucleus.jpa-5.1}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-rdbms</artifactId>
-            <version>${version.datanucleus.rdbms-5.1}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <!--
-                        NOTE: We also have a MANIFEST.MF statically defined for the use of a Maven reactor without the packaging phase.
-                        Changes to the following section should therefore also be reflected in that file.
-                        -->
-                        <manifestEntries>
-                            <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
-                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                            <Bundle-Name>blaze-persistence-integration-datanucleus</Bundle-Name>
-                            <Bundle-SymbolicName>com.blazebit.blaze-persistence-integration-datanucleus</Bundle-SymbolicName>
-                            <Bundle-Version>${project.version}</Bundle-Version>
-                            <Bundle-Vendor>Blazebit</Bundle-Vendor>
-                            <Require-Bundle>org.datanucleus,org.datanucleus.api.jpa</Require-Bundle>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.datanucleus;
-                                        requires org.datanucleus.api.jpa;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        provides com.blazebit.persistence.spi.ExtendedQuerySupport with com.blazebit.persistence.integration.datanucleus.DataNucleus51ExtendedQuerySupport;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.datanucleus.function.DataNucleus51EntityManagerFactoryIntegrator;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
deleted file mode 100644
index 1437506760..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.datanucleus.function.DataNucleus51EntityManagerFactoryIntegrator;
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.api.jpa.metadata.JPAAnnotationReader;
-import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.IdentityType;
-import org.datanucleus.metadata.MetaDataManager;
-import org.datanucleus.metadata.PackageMetaData;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CTEAnnotationReader extends JPAAnnotationReader {
-
-    private final boolean isDataNucleus4;
-    
-    public CTEAnnotationReader(MetaDataManager mgr) {
-        super(mgr);
-        String[] supportedAnnotationPacakges = new String[supportedPackages.length + 1];
-        System.arraycopy(supportedPackages, 0, supportedAnnotationPacakges, 0, supportedPackages.length);
-        supportedAnnotationPacakges[supportedAnnotationPacakges.length - 1] = "com.blazebit.persistence";
-        setSupportedAnnotationPackages(supportedAnnotationPacakges);
-        isDataNucleus4 = DataNucleus51EntityManagerFactoryIntegrator.MAJOR < 5;
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public AbstractClassMetaData getMetaDataForClass(Class cls, PackageMetaData pmd, ClassLoaderResolver clr) {
-        AbstractClassMetaData cmd = super.getMetaDataForClass(cls, pmd, clr);
-        
-        if (cmd == null) {
-            return null;
-        }
-        
-        if (!cls.isAnnotationPresent(CTE.class)) {
-            return cmd;
-        }
-
-        if (isDataNucleus4) {
-            cmd.setIdentityType(IdentityType.NONDURABLE);
-            cmd.addExtension("view-definition", "--");
-
-            for (int i = 0; i < cmd.getNoOfMembers(); i++) {
-                AbstractMemberMetaData mmd = cmd.getMetaDataForMemberAtRelativePosition(i);
-                if (mmd.isPrimaryKey()) {
-                    mmd.setPrimaryKey(false);
-                }
-            }
-        } else {
-            cmd.setIdentityType(IdentityType.APPLICATION);
-            cmd.addExtension("view-definition", "--");
-        }
-        return cmd;
-    }
-
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java
deleted file mode 100644
index 928e562cfa..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51ExtendedQuerySupport.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.spi.ExtendedQuerySupport;
-import org.datanucleus.store.rdbms.query.JPQLQuery;
-import org.datanucleus.store.rdbms.query.RDBMSQueryCompilation;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.lang.reflect.Field;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ExtendedQuerySupport.class)
-public class DataNucleus51ExtendedQuerySupport implements ExtendedQuerySupport {
-    
-    private static final Field DATASTORE_COMPILATION_FIELD;
-    
-    static {
-        try {
-            DATASTORE_COMPILATION_FIELD = JPQLQuery.class.getDeclaredField("datastoreCompilation");
-            DATASTORE_COMPILATION_FIELD.setAccessible(true);
-        } catch (Exception e) {
-            throw new RuntimeException("Unsupported datanucleus version!", e);
-        }
-    }
-
-    @Override
-    public boolean supportsAdvancedSql() {
-        return false;
-    }
-
-    @Override
-    public boolean needsExampleQueryForAdvancedDml() {
-        return false;
-    }
-
-    @Override
-    public boolean applyFirstResultMaxResults(Query query, int firstResult, int maxResults) {
-        query.setFirstResult(firstResult);
-        query.setMaxResults(maxResults);
-        return true;
-    }
-
-    @Override
-    public String getSql(EntityManager em, Query query) {
-        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
-        dnQuery.compile();
-        return (String) dnQuery.getNativeQuery();
-    }
-
-    @Override
-    public boolean getSqlContainsLimit() {
-        return true;
-    }
-
-    public List<String> getCascadingDeleteSql(EntityManager em, Query query) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public int getSqlSelectAliasPosition(EntityManager em, Query query, String alias) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public String getSqlAlias(EntityManager em, Query query, String alias, int queryPartNumber) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public SqlFromInfo getSqlFromInfo(EntityManager em, Query query, String alias, int queryPartNumber) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public int getSqlSelectAttributePosition(EntityManager em, Query query, String alias) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getResultList();
-    }
-
-    @Override
-    public Object getResultStream(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getResultStream();
-    }
-    
-    @Override
-    public Object getSingleResult(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getSingleResult();
-    }
-
-    @Override
-    public int executeUpdate(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query baseQuery, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.executeUpdate();
-    }
-
-    @Override
-    public ReturningResult<Object[]> executeReturning(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query modificationBaseQuery, Query exampleQuery, String sqlOverride, boolean queryPlanCacheEnabled) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-    
-    private void applySql(Query query, String sqlOverride) {
-        // TODO: parameter handling
-        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
-        // Disable caching for these queries
-        dnQuery.addExtension("datanucleus.query.compilation.cached", Boolean.FALSE);
-        try {
-            RDBMSQueryCompilation datastoreCompilation = (RDBMSQueryCompilation) DATASTORE_COMPILATION_FIELD.get(dnQuery);
-            datastoreCompilation.setSQL(sqlOverride);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaMetamodelAccessor.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaMetamodelAccessor.java
deleted file mode 100644
index 49613055a7..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaMetamodelAccessor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.integration.jpa.JpaMetamodelAccessorImpl;
-
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.3.0
- */
-public class DataNucleus51JpaMetamodelAccessor extends JpaMetamodelAccessorImpl {
-
-    public static final DataNucleus51JpaMetamodelAccessor INSTANCE = new DataNucleus51JpaMetamodelAccessor();
-
-    private DataNucleus51JpaMetamodelAccessor() {
-    }
-
-
-    @Override
-    public boolean isJoinable(Attribute<?, ?> attr) {
-        if (attr.isCollection()) {
-            return true;
-        }
-        SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-        // This is a special case for datanucleus... apparently an embedded id is an ONE_TO_ONE association although I think it should be an embedded
-        // TODO: create a test case for datanucleus and report the problem
-        if (singularAttribute.isId()) {
-            return false;
-        }
-        return attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.MANY_TO_ONE
-                || attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.ONE_TO_ONE;
-    }
-
-    @Override
-    public boolean isCompositeNode(Attribute<?, ?> attr) {
-        if (attr.isCollection()) {
-            PluralAttribute<?, ?, ?> pluralAttribute = (PluralAttribute<?, ?, ?>) attr;
-            if (pluralAttribute.getElementType().getPersistenceType() == Type.PersistenceType.BASIC) {
-                return false;
-            }
-            return true;
-        }
-        SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-        // This is a special case for datanucleus... apparently an embedded id is an ONE_TO_ONE association although I think it should be an embedded
-        // TODO: create a test case for datanucleus and report the problem
-        if (singularAttribute.isId()) {
-            return false;
-        }
-        return attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.MANY_TO_ONE
-                || attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.ONE_TO_ONE;
-    }
-
-    @Override
-    public boolean isElementCollection(Attribute<?, ?> attribute) {
-        if (attribute.getPersistentAttributeType() == Attribute.PersistentAttributeType.ELEMENT_COLLECTION) {
-            return true;
-        }
-        // Datanucleus kinda messes up the metamodel for some reason
-        if (attribute instanceof PluralAttribute<?, ?, ?>) {
-            Type.PersistenceType persistenceType = ((PluralAttribute<?, ?, ?>) attribute).getElementType().getPersistenceType();
-            //CHECKSTYLE:OFF: FallThrough
-            //CHECKSTYLE:OFF: MissingSwitchDefault
-            switch (persistenceType) {
-                case BASIC:
-                case EMBEDDABLE:
-                    return true;
-            }
-            //CHECKSTYLE:ON: FallThrough
-            //CHECKSTYLE:ON: MissingSwitchDefault
-        }
-        return false;
-    }
-
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java
deleted file mode 100644
index ac5ef25a44..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleus51JpaProvider.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.JoinType;
-import com.blazebit.persistence.spi.JoinTable;
-import com.blazebit.persistence.spi.JpaMetamodelAccessor;
-import com.blazebit.persistence.spi.JpaProvider;
-import org.datanucleus.ExecutionContext;
-import org.datanucleus.api.jpa.metamodel.AttributeImpl;
-import org.datanucleus.api.jpa.metamodel.EntityTypeImpl;
-import org.datanucleus.api.jpa.metamodel.ManagedTypeImpl;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.ColumnMetaData;
-import org.datanucleus.metadata.EmbeddedMetaData;
-import org.datanucleus.metadata.KeyMetaData;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class DataNucleus51JpaProvider implements JpaProvider {
-
-    private static final String[] EMPTY = {};
-    private final PersistenceUnitUtil persistenceUnitUtil;
-    private final int major;
-    private final int minor;
-    private final int fix;
-
-    public DataNucleus51JpaProvider(PersistenceUnitUtil persistenceUnitUtil, int major, int minor, int fix) {
-        this.persistenceUnitUtil = persistenceUnitUtil;
-        this.major = major;
-        this.minor = minor;
-        this.fix = fix;
-    }
-
-    @Override
-    public boolean supportsJpa21() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsEntityJoin() {
-        return major >= 5;
-    }
-
-    @Override
-    public boolean supportsCrossJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsInsertStatement() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBracketsForListParameter() {
-        return true;
-    }
-
-    @Override
-    public boolean needsJoinSubqueryRewrite() {
-        return false;
-    }
-
-    @Override
-    public String getBooleanExpression(boolean value) {
-        return value ? "TRUE" : "FALSE";
-    }
-
-    @Override
-    public String getBooleanConditionalExpression(boolean value) {
-        return value ? "TRUE" : "FALSE";
-    }
-
-    @Override
-    public String getNullExpression() {
-        return "NULL";
-    }
-
-    @Override
-    public String escapeCharacter(char character) {
-        return Character.toString(character);
-    }
-
-    @Override
-    public boolean supportsNullPrecedenceExpression() {
-        return true;
-    }
-
-    @Override
-    public void renderNullPrecedence(StringBuilder sb, String expression, String resolvedExpression, String order, String nulls) {
-        sb.append(expression);
-        if (order != null) {
-            sb.append(' ').append(order);
-
-            if (nulls != null) {
-                sb.append(" NULLS ").append(nulls);
-            }
-        }
-    }
-
-    @Override
-    public String getOnClause() {
-        return "ON";
-    }
-
-    @Override
-    public String getCollectionValueFunction() {
-        return "VALUE";
-    }
-
-    @Override
-    public boolean supportsCollectionValueDereference() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryLimitOffset() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSetOperations() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsListagg() {
-        return false;
-    }
-
-    @Override
-    public Class<?> getDefaultQueryResultType() {
-        return null;
-    }
-
-    @Override
-    public String getCustomFunctionInvocation(String functionName, int argumentCount) {
-        // Careful, PaginatedCriteriaBuilder has some dependency on the "length" of the string for rendering in the count query
-        return functionName + "(";
-    }
-
-    @Override
-    public boolean supportsRootTreat() {
-        // Although it might parse, it isn't really supported for JOINED inheritance as wrong SQL is generated
-        // TODO: create an issue for this
-        return true;
-    }
-
-    @Override
-    public boolean supportsTreatJoin() {
-        return major >= 5;
-    }
-
-    @Override
-    public boolean supportsTreatCorrelation() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypePropertyResolving() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypeRelationResolving() {
-        // Interestingly, joining a relation that is only available on a subtype works
-        return true;
-    }
-
-    @Override
-    public boolean supportsCountStar() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCountTuple() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCustomFunctions() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonScalarSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryInFunction() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryAliasShadowing() {
-        return false;
-    }
-
-    @Override
-    public String[] getDiscriminatorColumnCheck(EntityType<?> entityType) {
-        return null;
-    }
-
-    @Override
-    public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
-        ManagedTypeImpl<?> managedType = (ManagedTypeImpl<?>) ownerType;
-        String[] parts = attributeName.split("\\.");
-        AbstractMemberMetaData metaData = managedType.getMetadata().getMetaDataForMember(parts[0]);
-        for (int i = 1; i < parts.length; i++) {
-            EmbeddedMetaData embeddedMetaData = metaData.getEmbeddedMetaData();
-            if (embeddedMetaData == null) {
-                // Probably trying to access the id attribute of a ToMany relation
-                return metaData.getJoinMetaData() != null;
-            } else {
-                AbstractMemberMetaData[] metaDatas = embeddedMetaData.getMemberMetaData();
-                metaData = null;
-                for (int j = 0; j < metaDatas.length; j++) {
-                    if (parts[i].equals(metaDatas[j].getName())) {
-                        metaData = metaDatas[j];
-                        break;
-                    }
-                }
-
-                if (metaData == null) {
-                    throw new IllegalArgumentException("Could not find property '" + parts[i] + "' in embeddable type: " + ((AbstractMemberMetaData) embeddedMetaData.getParent()).getType().getName());
-                }
-            }
-        }
-
-        return metaData.getJoinMetaData() != null;
-    }
-
-    @Override
-    public boolean isColumnShared(EntityType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attributeName, JoinType joinType) {
-        return ConstraintType.NONE;
-    }
-
-    @Override
-    public String getMappedBy(EntityType<?> ownerType, String attributeName) {
-        AbstractMemberMetaData metaData = getAttribute(ownerType, attributeName).getMetadata();
-        return metaData.getMappedBy();
-    }
-
-    @Override
-    public Map<String, String> getWritableMappedByMappings(EntityType<?> inverseType, EntityType<?> ownerType, String attributeName, String inverseAttribute) {
-        return null;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    private AttributeImpl<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
-        if (attributeName.indexOf('.') == -1) {
-            return (AttributeImpl<?, ?>) ownerType.getAttribute(attributeName);
-        }
-        ManagedType<?> t = ownerType;
-        SingularAttribute<?, ?> attr = null;
-        String[] parts = attributeName.split("\\.");
-        for (int i = 0; i < parts.length; i++) {
-            attr = t.getSingularAttribute(parts[i]);
-            if (attr.getType().getPersistenceType() != Type.PersistenceType.BASIC) {
-                t = (ManagedType<?>) attr.getType();
-            } else if (i + 1 != parts.length) {
-                throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-            }
-        }
-
-        return (AttributeImpl<?, ?>) attr;
-    }
-
-    @Override
-    public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        AbstractMemberMetaData metaData = attribute.getMetadata();
-        if (metaData.getJoinMetaData() != null) {
-            Map<String, String> keyMapping = null;
-            Map<String, String> keyColumnTypes = null;
-            KeyMetaData keyMetaData = metaData.getKeyMetaData();
-            if (keyMetaData != null && keyMetaData.getColumnMetaData() != null) {
-                keyMapping = new LinkedHashMap<>();
-                ColumnMetaData[] keyColumnMetaData = keyMetaData.getColumnMetaData();
-                ColumnMetaData[] keyTargetPrimaryKeyColumnMetaData = keyMetaData.getForeignKeyMetaData() == null ? null : keyMetaData.getForeignKeyMetaData().getColumnMetaData();
-                if (keyTargetPrimaryKeyColumnMetaData == null) {
-                    keyMapping.put(keyMetaData.getColumnName(), keyMetaData.getColumnName());
-                } else {
-                    for (int i = 0; i < keyTargetPrimaryKeyColumnMetaData.length; i++) {
-                        keyMapping.put(keyColumnMetaData[i].getName(), keyTargetPrimaryKeyColumnMetaData[i].getName());
-                    }
-                }
-            } else if (metaData.getOrderMetaData() != null) {
-                String columnName = metaData.getOrderMetaData().getColumnName();
-                if (columnName != null) {
-                    keyMapping = Collections.singletonMap(columnName, columnName);
-                }
-            }
-
-            String tableName;
-            Map<String, String> idColumnMapping;
-            Map<String, String> targetIdColumnMapping;
-            if (metaData.getJoinMetaData().getTable() == null) {
-                tableName = metaData.getTable();
-                ColumnMetaData[] joinMetaData;
-                ColumnMetaData[] elementMetaData;
-
-                if (metaData.getJoinMetaData() == null || (joinMetaData = metaData.getJoinMetaData().getColumnMetaData()) == null) {
-                    idColumnMapping = Collections.emptyMap();
-                } else {
-                    idColumnMapping = new LinkedHashMap<>(joinMetaData.length);
-                    for (int i = 0; i < joinMetaData.length; i++) {
-                        idColumnMapping.put(joinMetaData[i].getName(), joinMetaData[i].getTarget());
-                    }
-                }
-                if (metaData.getElementMetaData() == null || (elementMetaData = metaData.getElementMetaData().getColumnMetaData()) == null) {
-                    targetIdColumnMapping = Collections.emptyMap();
-                } else {
-                    targetIdColumnMapping = new LinkedHashMap<>(elementMetaData.length);
-                    for (int i = 0; i < elementMetaData.length; i++) {
-                        targetIdColumnMapping.put(elementMetaData[i].getName(), elementMetaData[i].getTarget());
-                    }
-                }
-            } else {
-                tableName = metaData.getJoinMetaData().getTable();
-                ColumnMetaData[] primaryKeyColumnMetaData = metaData.getJoinMetaData().getPrimaryKeyMetaData().getColumnMetaData();
-                ColumnMetaData[] foreignKeyColumnMetaData = metaData.getJoinMetaData().getForeignKeyMetaData().getColumnMetaData();
-                idColumnMapping = new LinkedHashMap<>(primaryKeyColumnMetaData.length);
-                for (int i = 0; i < foreignKeyColumnMetaData.length; i++) {
-                    idColumnMapping.put(foreignKeyColumnMetaData[i].getName(), primaryKeyColumnMetaData[i].getName());
-                }
-
-                ColumnMetaData[] targetColumnMetaData = metaData.getJoinMetaData().getColumnMetaData();
-                ColumnMetaData[] targetPrimaryKeyColumnMetaData = metaData.getElementMetaData().getForeignKeyMetaData().getColumnMetaData();
-                targetIdColumnMapping = new LinkedHashMap<>(targetPrimaryKeyColumnMetaData.length);
-
-                for (int i = 0; i < targetColumnMetaData.length; i++) {
-                    targetIdColumnMapping.put(targetColumnMetaData[i].getName(), targetPrimaryKeyColumnMetaData[i].getName());
-                }
-            }
-
-            return new JoinTable(
-                    tableName,
-                    null,
-                    idColumnMapping,
-                    keyMapping,
-                    keyColumnTypes,
-                    null,
-                    targetIdColumnMapping
-            );
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean isBag(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute instanceof PluralAttribute) {
-            PluralAttribute<?, ?, ?> pluralAttr = (PluralAttribute<?, ?, ?>) attribute;
-            if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.COLLECTION) {
-                return true;
-            } else if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.LIST) {
-                AbstractMemberMetaData metaData = attribute.getMetadata();
-                return metaData.getOrderMetaData() == null;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        return attribute != null && attribute.getMetadata().isCascadeRemoveOrphans();
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        return attribute != null && attribute.getMetadata().isCascadeDelete();
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean hasJoinCondition(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id) {
-        ExecutionContext ec = em.unwrap(ExecutionContext.class);
-        return ec.getAttachedObjectForId(ec.newObjectId(entityClass, id)) != null;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationIdExpressions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsForeignAssociationInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetEmbeddable() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetAssociationId() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTransientEntityAsParameter() {
-        return false;
-    }
-
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBrokenAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsTypeConstraintForColumnSharing() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCollectionTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsJoinTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCorrelationPredicateWhenCorrelatingWithWhereClause() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationNaturalIdExpressions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsGroupByEntityAlias() {
-        return true;
-    }
-
-    @Override
-    public boolean needsElementCollectionIdCutoff() {
-        return false;
-    }
-
-    @Override
-    public boolean needsUnproxyForFieldAccess() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCaseWhenElseBranch() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsLikePatternEscape() {
-        return true;
-    }
-
-    @Override
-    public void setCacheable(Query query) {
-        query.setHint("datanucleus.query.results.cached", true);
-    }
-
-    @Override
-    public void setSingularParameter(Query query, String name, Object value) {
-        query.setParameter(name, value);
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute.getType() instanceof EntityType<?>) {
-            EntityTypeImpl<?> entityType = (EntityTypeImpl<?>) attribute.getType();
-            if (entityType.hasSingleIdAttribute()) {
-                return Collections.singletonList(entityType.getId(entityType.getIdType().getJavaType()).getName());
-            } else {
-                Set<SingularAttribute<?, ?>> attributes = (Set<SingularAttribute<?, ?>>) (Set) entityType.getIdClassAttributes();
-                List<String> attributeNames = new ArrayList<>(attributes.size());
-
-                for (Attribute<?, ?> attr : attributes) {
-                    attributeNames.add(attr.getName());
-                }
-
-                return attributeNames;
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public Map<String, String> getJoinMappingPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        List<String> keys;
-        if (elementCollectionPath == null) {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, attributeName);
-        } else {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, elementCollectionPath, attributeName);
-        }
-        Map<String, String> map = new LinkedHashMap<>(keys.size());
-        for (String key : keys) {
-            map.put(key, null);
-        }
-        return map;
-    }
-
-    @Override
-    public boolean supportsEnumLiteral(ManagedType<?> ownerType, String attributeName, boolean key) {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTemporalLiteral() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonDrivingAliasInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSelectCompositeIdEntityInSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyParameterForNonPkAssociation() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyRemove() {
-        return false;
-    }
-
-    @Override
-    public void initialize(Object entity) {
-        // Just call a method on the entity to trigger possible lazy initialization
-        entity.hashCode();
-    }
-
-    @Override
-    public Object getIdentifier(Object entity) {
-        return persistenceUnitUtil.getIdentifier(entity);
-    }
-
-    @Override
-    public <T> T unproxy(T entity) {
-        // DataNucleus doesn't support proxies, but only enhancement
-        return entity;
-    }
-
-    @Override
-    public JpaMetamodelAccessor getJpaMetamodelAccessor() {
-        return DataNucleus51JpaMetamodelAccessor.INSTANCE;
-    }
-
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
deleted file mode 100644
index 75ec702d55..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
-import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
-import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
-import org.datanucleus.store.rdbms.sql.expression.EnumExpression;
-import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.expression.StringExpression;
-import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-import org.datanucleus.store.rdbms.sql.method.SimpleOrderableAggregateMethod;
-
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public abstract class AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    private static final Logger LOG = Logger.getLogger(JpqlFunctionSQLMethod.class.getName());
-    protected final SQLStatement stmt;
-    protected final SQLMethod function;
-
-    public AbstractJpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
-        this.stmt = stmt;
-        this.function = function;
-    }
-
-    @Override
-    public boolean hasArguments() {
-        // Not sure how to determine that
-        return true;
-    }
-
-    @Override
-    public boolean hasParenthesesIfNoArguments() {
-        // Not sure how to determine that
-        return true;
-    }
-
-    @Override
-    public Class<?> getReturnType(Class<?> firstArgumentType) {
-        if (firstArgumentType == null) {
-            return null;
-        }
-        SQLExpression expression;
-        JavaTypeMapping argumentTypeMapping = stmt.getSQLExpressionFactory().getMappingForType(firstArgumentType, true);
-        if (java.sql.Date.class.isAssignableFrom(firstArgumentType)) {
-            expression = new TemporalExpression(stmt, argumentTypeMapping, "", null);
-        } else if (Byte.class.isAssignableFrom(firstArgumentType)) {
-            expression = new ByteExpression(stmt, null, argumentTypeMapping);
-        } else if (Number.class.isAssignableFrom(firstArgumentType)) {
-            expression = new NumericExpression(stmt, argumentTypeMapping, "");
-        } else if (String.class.isAssignableFrom(firstArgumentType)) {
-            expression = new StringExpression(stmt, null, argumentTypeMapping);
-        } else if (Character.class.isAssignableFrom(firstArgumentType)) {
-            expression = new CharacterExpression(stmt, null, argumentTypeMapping);
-        } else if (Boolean.class.isAssignableFrom(firstArgumentType)) {
-            expression = new BooleanExpression(stmt, argumentTypeMapping, "");
-        } else if (firstArgumentType.isEnum()) {
-            // DataNucleus needs a table to handle aggregates on enums, so we just assume the aggregate will be MIN/MAX
-            if (function instanceof SimpleOrderableAggregateMethod) {
-                return firstArgumentType;
-            }
-            expression = new EnumExpression(stmt, null, argumentTypeMapping);
-        } else {
-            throw new UnsupportedOperationException("Unsupported data type: " + firstArgumentType.getName());
-        }
-        SQLExpression resultExpression = getExpression(stmt, expression);
-        return resultExpression.getJavaTypeMapping().getJavaType();
-    }
-
-    protected abstract SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression);
-
-    @Override
-    public void render(FunctionRenderContext context) {
-        throw new UnsupportedOperationException("Rendering functions through this API is not possible!");
-    }
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
deleted file mode 100644
index aad17dcbc8..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import org.datanucleus.store.rdbms.sql.SQLText;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSQLText extends SQLText {
-
-    private final String sql;
-
-    public CustomSQLText(String sql, SQLExpression expr, List<SQLExpression> expressions) {
-        this.sql = sql;
-        
-        if (expr != null) {
-            append(expr);
-        }
-
-        for (SQLExpression expression : expressions) {
-            append(expression);
-        }
-    }
-
-    @Override
-    public String toSQL() {
-        // Call super to trigger parameter handling
-        super.toSQL();
-        return sql;
-    }
-    
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java
deleted file mode 100644
index cf3978d489..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleus51EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.datanucleus.DataNucleus51JpaProvider;
-import com.blazebit.persistence.integration.jpa.function.CountStarFunction;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import com.blazebit.persistence.spi.JpqlFunction;
-import com.blazebit.persistence.spi.JpqlFunctionGroup;
-import org.datanucleus.NucleusContext;
-import org.datanucleus.store.StoreManager;
-import org.datanucleus.store.rdbms.RDBMSStoreManager;
-import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
-import org.datanucleus.store.rdbms.identifier.DatastoreIdentifier;
-import org.datanucleus.store.rdbms.query.QueryGenerator;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpressionFactory;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-import org.datanucleus.store.rdbms.table.Table;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian Beikov
- * @author Moritz Becker
- *
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class DataNucleus51EntityManagerFactoryIntegrator implements EntityManagerFactoryIntegrator {
-
-    public static final String VERSION;
-    public static final int MAJOR;
-    public static final int MINOR;
-    public static final int FIX;
-
-    private static final Logger LOG = Logger.getLogger(DataNucleus51EntityManagerFactoryIntegrator.class.getName());
-    private static final Map<String, String> VENDOR_TO_DBMS_MAPPING = new HashMap<String, String>();
-    private static final String[] BUILTIN_FUNCTIONS = {
-        "abs",
-        "acos",
-        "asin",
-        "atan",
-        "avg",
-        "ceil",
-        "cos",
-        "count",
-        "exp",
-        "floor",
-        "log",
-        "max",
-        "min",
-        "power",
-        "sin",
-        "sqrt",
-        "sum",
-        "tan",
-        "degrees",
-        "radians",
-        "ABS",
-        "ACOS",
-        "ASIN",
-        "ATAN",
-        "AVG",
-        "CEIL",
-        "COS",
-        "COUNT",
-        "COUNTSTAR",
-        "EXP",
-        "FLOOR",
-        "LOG",
-        "MAX",
-        "MIN",
-        "POWER",
-        "SIN",
-        "SQRT",
-        "SUM",
-        "TAN",
-        "RADIANS",
-        "DEGREES",
-        "COALESCE",
-        "NULLIF",
-        "INDEX",
-        "CURRENT_DATE",
-        "CURRENT_TIME",
-        "CURRENT_TIMESTAMP",
-        "SQL_boolean",
-        "SQL_numeric",
-        "SQL_function",
-        "YEAR",
-        "MONTH",
-        "MONTH_JAVA",
-        "DAY",
-        "HOUR",
-        "MINUTE",
-        "SECOND"
-    };
-    
-    static {
-        VENDOR_TO_DBMS_MAPPING.put("h2", "h2");
-        VENDOR_TO_DBMS_MAPPING.put("mysql", "mysql");
-        VENDOR_TO_DBMS_MAPPING.put("db2", "db2");
-        VENDOR_TO_DBMS_MAPPING.put("firebird", "firebird");
-        VENDOR_TO_DBMS_MAPPING.put("postgresql", "postgresql");
-        VENDOR_TO_DBMS_MAPPING.put("oracle", "oracle");
-        VENDOR_TO_DBMS_MAPPING.put("sqlite", "sqlite");
-        VENDOR_TO_DBMS_MAPPING.put("sqlserver", "microsoft");
-        VENDOR_TO_DBMS_MAPPING.put("sybase", "sybase");
-//        VENDOR_TO_DBMS_MAPPING.put("", "cubrid");
-        VENDOR_TO_DBMS_MAPPING.put("hsql", "hsql");
-        VENDOR_TO_DBMS_MAPPING.put("informix", "informix");
-//        VENDOR_TO_DBMS_MAPPING.put("", "ingres");
-//        VENDOR_TO_DBMS_MAPPING.put("", "interbase");
-
-        VERSION = readMavenPropertiesVersion("META-INF/maven/org.datanucleus/datanucleus-core/pom.properties");
-
-        String[] versionParts = VERSION.split("[\\.-]");
-        MAJOR = Integer.parseInt(versionParts[0]);
-        MINOR = Integer.parseInt(versionParts[1]);
-        FIX = Integer.parseInt(versionParts[2]);
-    }
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        DatastoreAdapter datastoreAdapter = storeMgr.getDatastoreAdapter();
-        String vendorID = datastoreAdapter.getVendorID();
-        if ("mysql".equals(vendorID)) {
-            String datastoreProductVersion = datastoreAdapter.getDatastoreProductVersion();
-            if (Integer.parseInt(datastoreProductVersion.substring(0, datastoreProductVersion.indexOf('.'))) > 7) {
-                return "mysql8";
-            }
-        }
-        return VENDOR_TO_DBMS_MAPPING.get(vendorID);
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                return new DataNucleus51JpaProvider(persistenceUnitUtil, MAJOR, MINOR, FIX);
-            }
-        };
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public EntityManagerFactory registerFunctions(EntityManagerFactory entityManagerFactory, Map<String, JpqlFunctionGroup> dbmsFunctions) {
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
-        String dbms = VENDOR_TO_DBMS_MAPPING.get(storeMgr.getDatastoreAdapter().getVendorID());
-
-        // Register compatibility functions
-        if (!exprFactory.isMethodRegistered(null, CountStarFunction.FUNCTION_NAME)) {
-            exprFactory.registerMethod(null, CountStarFunction.FUNCTION_NAME, new DataNucleusJpqlFunctionAdapter(new CountStarFunction(), true));
-        }
-
-        // construct map for checking existence of functions in a case-insensitive way
-        Map<String, JpqlFunction> registeredFunctions = getRegisteredFunctions(entityManagerFactory);
-        Map<String, String> caseInsensitiveRegisteredFunctions = new HashMap<>(registeredFunctions.size());
-        for (String registeredFunctionName : registeredFunctions.keySet()) {
-            caseInsensitiveRegisteredFunctions.put(registeredFunctionName.toLowerCase(), registeredFunctionName);
-        }
-
-        for (Map.Entry<String, JpqlFunctionGroup> functionEntry : dbmsFunctions.entrySet()) {
-            String functionName = functionEntry.getKey();
-            JpqlFunctionGroup dbmsFunctionGroup = functionEntry.getValue();
-            JpqlFunction function = dbmsFunctionGroup.get(dbms);
-            
-            if (function == null && !dbmsFunctionGroup.contains(dbms)) {
-                function = dbmsFunctionGroup.get(null);
-            }
-            if (function == null) {
-                LOG.warning("Could not register the function '" + functionName + "' because there is neither an implementation for the dbms '" + dbms + "' nor a default implementation!");
-            } else if (!caseInsensitiveRegisteredFunctions.containsKey(functionName.toLowerCase())) {
-                exprFactory.registerMethod(null, functionName, new DataNucleusJpqlFunctionAdapter(function, dbmsFunctionGroup.isAggregate()));
-            }
-        }
-        
-        return entityManagerFactory;
-    }
-
-    @Override
-    public Map<String, JpqlFunction> getRegisteredFunctions(EntityManagerFactory entityManagerFactory) {
-        NucleusContext context = entityManagerFactory.unwrap(NucleusContext.class);
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        String storeName = storeMgr.getDatastoreAdapter().getVendorID();
-        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
-        
-        Set<Object> methodKeys = fieldGet("pluginSqlMethodsKeysSupported", exprFactory);
-        Map<String, JpqlFunction> functions = new HashMap<>();
-
-        // We need to construct a statement object and how this is done changed between 4 and 5 so we have to do a little reflection hack
-        // We need this because the function methods retrieve the expression factory through it
-        Class<?>[] parameterTypes = {RDBMSStoreManager.class, Table.class, DatastoreIdentifier.class, String.class};
-        SQLStatement stmt;
-
-        try {
-            Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SelectStatement").getConstructor(parameterTypes);
-            stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
-        } catch (Exception e) {
-            try {
-                Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SQLStatement").getConstructor(parameterTypes);
-                stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
-            } catch (Exception e2) {
-                throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", e2);
-            }
-        }
-
-        // Well apparently expressions get their class loader resolver by asking the statement they are part of
-        // which in turn asks the query generator that is responsible for it
-        // So this is the most non-hackish way to get this to work...
-        QueryGenerator noopGenerator = (QueryGenerator) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ QueryGenerator.class }, new QueryGeneratorInvocationHandler(context));
-        stmt.setQueryGenerator(noopGenerator);
-
-        try {
-            Method getMethod = SQLExpressionFactory.class.getDeclaredMethod("getMethod", String.class, String.class, List.class);
-            getMethod.setAccessible(true);
-
-            for (Object methodKey : methodKeys) {
-                String className = fieldGet("clsName", methodKey);
-                String datastoreName = fieldGet("datastoreName", methodKey);
-                String name = fieldGet("methodName", methodKey);
-                if (className.isEmpty()
-                        && name.indexOf('.') == -1
-                        && ("ALL".equals(datastoreName) || storeName.equals(datastoreName))) {
-                    // Only consider normal functions
-                    SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, null, name, Collections.emptyList());
-                    if (method instanceof DataNucleusJpqlFunctionAdapter) {
-                        functions.put(name, ((DataNucleusJpqlFunctionAdapter) method).unwrap());
-                    } else {
-                        functions.put(name, new JpqlFunctionSQLMethod(stmt, method));
-                    }
-                }
-            }
-
-            for (String name : BUILTIN_FUNCTIONS) {
-                SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, null, name, Collections.emptyList());
-                if (method instanceof DataNucleusJpqlFunctionAdapter) {
-                    functions.put(name, ((DataNucleusJpqlFunctionAdapter) method).unwrap());
-                } else {
-                    functions.put(name, new JpqlFunctionSQLMethod(stmt, method));
-                }
-            }
-
-            // The length function is the single exception to all functions that is based on a class
-            SQLMethod method = (SQLMethod) getMethod.invoke(exprFactory, "java.lang.String", "length", Collections.emptyList());
-            functions.put("length", new JpqlFunctionInstanceSQLMethod(stmt, method));
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", ex);
-        }
-        
-        return functions;
-    }
-    
-    private static String readMavenPropertiesVersion(String name) {
-        InputStream is = null;
-        try {
-            is = NucleusContext.class.getClassLoader().getResourceAsStream(name);
-            Properties p = new Properties();
-            p.load(is);
-            return p.getProperty("version");
-        } catch (IOException e) {
-            throw new RuntimeException("Could not access the maven version properties of datanucleus!", e);
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    // Ignore
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T> T fieldGet(String fieldName, Object value) {
-        Exception ex;
-        Field field = null;
-        boolean madeAccessible = false;
-        
-        try {
-            field = value.getClass().getDeclaredField(fieldName);
-            madeAccessible = !field.isAccessible();
-            
-            if (madeAccessible) {
-                field.setAccessible(true);
-            }
-            
-            return (T) field.get(value);
-        } catch (NoSuchFieldException e) {
-            ex = e;
-        } catch (SecurityException e) {
-            ex = e;
-        } catch (IllegalArgumentException e) {
-            ex = e;
-        } catch (IllegalAccessException e) {
-            ex = e;
-        } finally {
-            if (madeAccessible) {
-                field.setAccessible(false);
-            }
-        }
-        
-        throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", ex);
-    }
-    
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
deleted file mode 100644
index 8e2102e8e1..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-
-import java.util.List;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class DataNucleusFunctionRenderContext implements FunctionRenderContext {
-    
-    private final StringBuilder sb = new StringBuilder();
-    private final List<?> arguments;
-
-    public DataNucleusFunctionRenderContext(List<?> arguments) {
-        this.arguments = arguments;
-    }
-
-    @Override
-    public int getArgumentsSize() {
-        return arguments.size();
-    }
-
-    @Override
-    public String getArgument(int index) {
-        return arguments.get(index).toString();
-    }
-
-    @Override
-    public void addArgument(int index) {
-        sb.append(arguments.get(index));
-    }
-
-    @Override
-    public void addChunk(String chunk) {
-        sb.append(chunk);
-    }
-    
-    public String renderToString() {
-        return sb.toString();
-    }
-
-    @Override
-    public String toString() {
-        return "HibernateFunctionRenderContext{" + "arguments=" + arguments + '}';
-    }
-    
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
deleted file mode 100644
index 769848f294..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.mapping.java.TemporalMapping;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.SQLText;
-import org.datanucleus.store.rdbms.sql.expression.AggregateNumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.AggregateStringExpression;
-import org.datanucleus.store.rdbms.sql.expression.AggregateTemporalExpression;
-import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
-import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
-import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
-import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.expression.StringExpression;
-import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class DataNucleusJpqlFunctionAdapter implements SQLMethod {
-    
-    private static final Logger LOG = Logger.getLogger(DataNucleusJpqlFunctionAdapter.class.getName());
-    private final JpqlFunction function;
-    private final boolean aggregate;
-
-    public DataNucleusJpqlFunctionAdapter(JpqlFunction function, boolean aggregate) {
-        this.function = function;
-        this.aggregate = aggregate;
-    }
-
-    public JpqlFunction unwrap() {
-        return function;
-    }
-
-    @Override
-    public SQLExpression getExpression(SQLStatement stmt, SQLExpression expr, List<SQLExpression> args) {
-        // NOTE: expr will be the first argument for class methods like getMonth!
-        int argsSize = args.size();
-        List<String> newArgs = new ArrayList<String>(argsSize + (expr == null ? 0 : 1));
-        Class<?> firstArgumentType = null;
-        JavaTypeMapping firstArgumentTypeMapping = null;
-        
-        if (expr != null) {
-            firstArgumentTypeMapping = expr.getJavaTypeMapping();
-            firstArgumentType = firstArgumentTypeMapping.getJavaType();
-            newArgs.add(expr.toSQLText().toSQL());
-            for (int i = 0; i < argsSize; i++) {
-                newArgs.add(args.get(i).toSQLText().toSQL());
-            }
-        } else if (argsSize > 0) {
-            firstArgumentTypeMapping = args.get(0).getJavaTypeMapping();
-            firstArgumentType = firstArgumentTypeMapping.getJavaType();
-            newArgs.add(args.get(0).toSQLText().toSQL());
-            for (int i = 1; i < argsSize; i++) {
-                newArgs.add(args.get(i).toSQLText().toSQL());
-            }
-        }
-        
-        Class<?> returnType = function.getReturnType(firstArgumentType);
-        JavaTypeMapping returnTypeMapping;
-        
-        if (returnType == firstArgumentType) {
-            returnTypeMapping = firstArgumentTypeMapping;
-        } else {
-            returnTypeMapping = stmt.getSQLExpressionFactory().getMappingForType(returnType);
-        }
-        
-        if (returnTypeMapping == null) {
-            throw new IllegalArgumentException("Invalid return type null returned from function: " + function);
-        }
-        
-        final DataNucleusFunctionRenderContext context = new DataNucleusFunctionRenderContext(newArgs);
-        function.render(context);
-        
-        final SQLText sqlText = new CustomSQLText(context.renderToString(), expr, args);
-        
-        if (aggregate) {
-            if (returnTypeMapping instanceof TemporalMapping) {
-                return new AggregateTemporalExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new AggregateNumericExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new AggregateStringExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else {
-                LOG.warning("Aggregate type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
-            }
-        } else {
-            if (returnTypeMapping instanceof TemporalMapping) {
-                return new TemporalExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Byte.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new ByteExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new NumericExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new StringExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Character.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new CharacterExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Boolean.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new BooleanExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else {
-                LOG.warning("Type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
-            }
-        }
-        
-        return new SQLExpression(stmt, null, returnTypeMapping) {
-            @Override
-            public SQLText toSQLText() {
-                return sqlText;
-            }
-        };
-    }
-
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
deleted file mode 100644
index 84d52f23f0..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-
-import java.util.Collections;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JpqlFunctionInstanceSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    public JpqlFunctionInstanceSQLMethod(SQLStatement stmt, SQLMethod function) {
-        super(stmt, function);
-    }
-
-    @Override
-    protected SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression) {
-        return function.getExpression(stmt, argumentExpression, Collections.EMPTY_LIST);
-    }
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
deleted file mode 100644
index 17a7e5ee65..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-
-import java.util.Arrays;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public class JpqlFunctionSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    public JpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
-        super(stmt, function);
-    }
-
-    @Override
-    protected SQLExpression getExpression(SQLStatement stmt, SQLExpression argumentExpression) {
-        return function.getExpression(stmt, null, Arrays.asList(argumentExpression));
-    }
-}
diff --git a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java b/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
deleted file mode 100644
index 0bab27f7e7..0000000000
--- a/integration/datanucleus-5.1/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import org.datanucleus.NucleusContext;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public class QueryGeneratorInvocationHandler implements InvocationHandler {
-
-    private final NucleusContext context;
-
-    public QueryGeneratorInvocationHandler(NucleusContext context) {
-        this.context = context;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getClassLoaderResolver".equals(method.getName())) {
-            return context.getClassLoaderResolver(null);
-        }
-        return null;
-    }
-}
diff --git a/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF b/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 4b3b8d80bb..0000000000
--- a/integration/datanucleus-5.1/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: blaze-persistence-integration-datanucleus
-Bundle-SymbolicName: com.blazebit.blaze-persistence-integration-datanucleus
-Bundle-Version: 1.0.0
-Bundle-Vendor: Blazebit
-Require-Bundle: org.datanucleus,org.datanucleus.api.jpa
diff --git a/integration/datanucleus-5.1/src/main/resources/plugin.xml b/integration/datanucleus-5.1/src/main/resources/plugin.xml
deleted file mode 100644
index d60bc670f4..0000000000
--- a/integration/datanucleus-5.1/src/main/resources/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<plugin id="com.blazebit.persistence" name="Blaze-Persistence DataNucleus plugin" provider-name="Blazebit">
-    <extension point="org.datanucleus.annotations">
-        <annotations annotation-class="com.blazebit.persistence.CTE" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Entity" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.MappedSuperclass" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Embeddable" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedNativeQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedNativeQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedStoredProcedureQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedStoredProcedureQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="org.datanucleus.api.jpa.annotations.PersistenceAware" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Converter" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-    </extension>
-</plugin>
\ No newline at end of file
diff --git a/integration/datanucleus/pom.xml b/integration/datanucleus/pom.xml
deleted file mode 100644
index b6f0f348ba..0000000000
--- a/integration/datanucleus/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration DataNucleus</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.datanucleus</module.name>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>DataNucleus Nightly</id>
-            <name>DataNucleus Repository Nightly</name>
-            <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-core</artifactId>
-            <version>${version.datanucleus.base-4}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jpa</artifactId>
-            <version>${version.datanucleus.api-jpa-4}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jpa-query</artifactId>
-            <version>${version.datanucleus.jpa-4}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-rdbms</artifactId>
-            <version>${version.datanucleus.rdbms-4}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <!--
-                        NOTE: We also have a MANIFEST.MF statically defined for the use of a Maven reactor without the packaging phase.
-                        Changes to the following section should therefore also be reflected in that file.
-                        -->
-                        <manifestEntries>
-                            <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
-                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                            <Bundle-Name>blaze-persistence-integration-datanucleus</Bundle-Name>
-                            <Bundle-SymbolicName>com.blazebit.blaze-persistence-integration-datanucleus</Bundle-SymbolicName>
-                            <Bundle-Version>${project.version}</Bundle-Version>
-                            <Bundle-Vendor>Blazebit</Bundle-Vendor>
-                            <Require-Bundle>org.datanucleus,org.datanucleus.api.jpa</Require-Bundle>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.datanucleus;
-                                        requires org.datanucleus.api.jpa;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        provides com.blazebit.persistence.spi.ExtendedQuerySupport with com.blazebit.persistence.integration.datanucleus.DataNucleusExtendedQuerySupport;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.datanucleus.function.DataNucleusEntityManagerFactoryIntegrator;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
deleted file mode 100644
index 04b62e9d67..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/CTEAnnotationReader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.datanucleus.function.DataNucleusEntityManagerFactoryIntegrator;
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.api.jpa.metadata.JPAAnnotationReader;
-import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.IdentityType;
-import org.datanucleus.metadata.MetaDataManager;
-import org.datanucleus.metadata.PackageMetaData;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CTEAnnotationReader extends JPAAnnotationReader {
-
-    private final boolean isDataNucleus4;
-    
-    public CTEAnnotationReader(MetaDataManager mgr) {
-        super(mgr);
-        String[] supportedAnnotationPacakges = new String[supportedPackages.length + 1];
-        System.arraycopy(supportedPackages, 0, supportedAnnotationPacakges, 0, supportedPackages.length);
-        supportedAnnotationPacakges[supportedAnnotationPacakges.length - 1] = "com.blazebit.persistence";
-        setSupportedAnnotationPackages(supportedAnnotationPacakges);
-        isDataNucleus4 = DataNucleusEntityManagerFactoryIntegrator.MAJOR < 5;
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public AbstractClassMetaData getMetaDataForClass(Class cls, PackageMetaData pmd, ClassLoaderResolver clr) {
-        AbstractClassMetaData cmd = super.getMetaDataForClass(cls, pmd, clr);
-        
-        if (cmd == null) {
-            return null;
-        }
-        
-        if (!cls.isAnnotationPresent(CTE.class)) {
-            return cmd;
-        }
-
-        if (isDataNucleus4) {
-            cmd.setIdentityType(IdentityType.NONDURABLE);
-            cmd.addExtension("view-definition", "--");
-
-            for (int i = 0; i < cmd.getNoOfMembers(); i++) {
-                AbstractMemberMetaData mmd = cmd.getMetaDataForMemberAtRelativePosition(i);
-                if (mmd.isPrimaryKey()) {
-                    mmd.setPrimaryKey(false);
-                }
-            }
-        } else {
-            cmd.setIdentityType(IdentityType.APPLICATION);
-            cmd.addExtension("view-definition", "--");
-        }
-        return cmd;
-    }
-
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusExtendedQuerySupport.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusExtendedQuerySupport.java
deleted file mode 100644
index 5555e330b5..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusExtendedQuerySupport.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.spi.ExtendedQuerySupport;
-import org.datanucleus.store.rdbms.query.JPQLQuery;
-import org.datanucleus.store.rdbms.query.RDBMSQueryCompilation;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.lang.reflect.Field;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ExtendedQuerySupport.class)
-public class DataNucleusExtendedQuerySupport implements ExtendedQuerySupport {
-    
-    private static final Field DATASTORE_COMPILATION_FIELD;
-    
-    static {
-        try {
-            DATASTORE_COMPILATION_FIELD = JPQLQuery.class.getDeclaredField("datastoreCompilation");
-            DATASTORE_COMPILATION_FIELD.setAccessible(true);
-        } catch (Exception e) {
-            throw new RuntimeException("Unsupported datanucleus version!", e);
-        }
-    }
-
-    @Override
-    public boolean supportsAdvancedSql() {
-        return false;
-    }
-
-    @Override
-    public boolean needsExampleQueryForAdvancedDml() {
-        return false;
-    }
-
-    @Override
-    public boolean applyFirstResultMaxResults(Query query, int firstResult, int maxResults) {
-        query.setFirstResult(firstResult);
-        query.setMaxResults(maxResults);
-        return true;
-    }
-
-    @Override
-    public String getSql(EntityManager em, Query query) {
-        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
-        dnQuery.compile();
-        return (String) dnQuery.getNativeQuery();
-    }
-
-    @Override
-    public boolean getSqlContainsLimit() {
-        return true;
-    }
-    
-    public List<String> getCascadingDeleteSql(EntityManager em, Query query) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public int getSqlSelectAliasPosition(EntityManager em, Query query, String alias) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public String getSqlAlias(EntityManager em, Query query, String alias, int queryPartNumber) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public SqlFromInfo getSqlFromInfo(EntityManager em, Query query, String alias, int queryPartNumber) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    public int getSqlSelectAttributePosition(EntityManager em, Query query, String alias) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getResultList();
-    }
-
-    @Override
-    public Object getResultStream(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getResultList().stream();
-    }
-
-    @Override
-    public Object getSingleResult(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.getSingleResult();
-    }
-
-    @Override
-    public int executeUpdate(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query baseQuery, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        applySql(query, sqlOverride);
-        return query.executeUpdate();
-    }
-
-    @Override
-    public ReturningResult<Object[]> executeReturning(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query modificationBaseQuery, Query exampleQuery, String sqlOverride, boolean queryPlanCacheEnabled) {
-        // TODO: implement
-        throw new UnsupportedOperationException("Not yet implemeneted!");
-    }
-    
-    private void applySql(Query query, String sqlOverride) {
-        // TODO: parameter handling
-        org.datanucleus.store.query.Query<?> dnQuery = query.unwrap(org.datanucleus.store.query.Query.class);
-        // Disable caching for these queries
-        dnQuery.addExtension("datanucleus.query.compilation.cached", Boolean.FALSE);
-        try {
-            RDBMSQueryCompilation datastoreCompilation = (RDBMSQueryCompilation) DATASTORE_COMPILATION_FIELD.get(dnQuery);
-            datastoreCompilation.setSQL(sqlOverride);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaMetamodelAccessor.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaMetamodelAccessor.java
deleted file mode 100644
index 49e99dba87..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaMetamodelAccessor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.integration.jpa.JpaMetamodelAccessorImpl;
-
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.3.0
- */
-public class DataNucleusJpaMetamodelAccessor extends JpaMetamodelAccessorImpl {
-
-    public static final DataNucleusJpaMetamodelAccessor INSTANCE = new DataNucleusJpaMetamodelAccessor();
-
-    private DataNucleusJpaMetamodelAccessor() {
-    }
-
-    @Override
-    public boolean isJoinable(Attribute<?, ?> attr) {
-        if (attr.isCollection()) {
-            return true;
-        }
-        SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-        // This is a special case for datanucleus... apparently an embedded id is an ONE_TO_ONE association although I think it should be an embedded
-        // TODO: create a test case for datanucleus and report the problem
-        if (singularAttribute.isId()) {
-            return false;
-        }
-        return attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.MANY_TO_ONE
-                || attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.ONE_TO_ONE;
-    }
-
-    @Override
-    public boolean isCompositeNode(Attribute<?, ?> attr) {
-        if (attr.isCollection()) {
-            PluralAttribute<?, ?, ?> pluralAttribute = (PluralAttribute<?, ?, ?>) attr;
-            if (pluralAttribute.getElementType().getPersistenceType() == Type.PersistenceType.BASIC) {
-                return false;
-            }
-            return true;
-        }
-        SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-        // This is a special case for datanucleus... apparently an embedded id is an ONE_TO_ONE association although I think it should be an embedded
-        // TODO: create a test case for datanucleus and report the problem
-        if (singularAttribute.isId()) {
-            return false;
-        }
-        return attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.MANY_TO_ONE
-                || attr.getPersistentAttributeType() == Attribute.PersistentAttributeType.ONE_TO_ONE;
-    }
-
-    @Override
-    public boolean isElementCollection(Attribute<?, ?> attribute) {
-        if (attribute.getPersistentAttributeType() == Attribute.PersistentAttributeType.ELEMENT_COLLECTION) {
-            return true;
-        }
-        // Datanucleus kinda messes up the metamodel for some reason
-        if (attribute instanceof PluralAttribute<?, ?, ?>) {
-            Type.PersistenceType persistenceType = ((PluralAttribute<?, ?, ?>) attribute).getElementType().getPersistenceType();
-            //CHECKSTYLE:OFF: FallThrough
-            //CHECKSTYLE:OFF: MissingSwitchDefault
-            switch (persistenceType) {
-                case BASIC:
-                case EMBEDDABLE:
-                    return true;
-            }
-            //CHECKSTYLE:ON: FallThrough
-            //CHECKSTYLE:ON: MissingSwitchDefault
-        }
-        return false;
-    }
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaProvider.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaProvider.java
deleted file mode 100644
index 41e771e123..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/DataNucleusJpaProvider.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus;
-
-import com.blazebit.persistence.JoinType;
-import com.blazebit.persistence.spi.JoinTable;
-import com.blazebit.persistence.spi.JpaMetamodelAccessor;
-import com.blazebit.persistence.spi.JpaProvider;
-import org.datanucleus.ExecutionContext;
-import org.datanucleus.api.jpa.metamodel.AttributeImpl;
-import org.datanucleus.api.jpa.metamodel.EntityTypeImpl;
-import org.datanucleus.api.jpa.metamodel.ManagedTypeImpl;
-import org.datanucleus.identity.SingleFieldId;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.ColumnMetaData;
-import org.datanucleus.metadata.EmbeddedMetaData;
-import org.datanucleus.metadata.KeyMetaData;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class DataNucleusJpaProvider implements JpaProvider {
-
-    private static final String[] EMPTY = {};
-    private final PersistenceUnitUtil persistenceUnitUtil;
-    private final int major;
-    private final int minor;
-    private final int fix;
-
-    public DataNucleusJpaProvider(PersistenceUnitUtil persistenceUnitUtil, int major, int minor, int fix) {
-        this.persistenceUnitUtil = persistenceUnitUtil;
-        this.major = major;
-        this.minor = minor;
-        this.fix = fix;
-    }
-
-    @Override
-    public boolean supportsJpa21() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsEntityJoin() {
-        return major >= 5;
-    }
-
-    @Override
-    public boolean supportsCrossJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsInsertStatement() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBracketsForListParameter() {
-        return true;
-    }
-
-    @Override
-    public boolean needsJoinSubqueryRewrite() {
-        return false;
-    }
-
-    @Override
-    public String getBooleanExpression(boolean value) {
-        return value ? "TRUE" : "FALSE";
-    }
-
-    @Override
-    public String getBooleanConditionalExpression(boolean value) {
-        return value ? "TRUE" : "FALSE";
-    }
-
-    @Override
-    public String getNullExpression() {
-        return "NULL";
-    }
-
-    @Override
-    public String escapeCharacter(char character) {
-        return Character.toString(character);
-    }
-
-    @Override
-    public boolean supportsNullPrecedenceExpression() {
-        return true;
-    }
-
-    @Override
-    public void renderNullPrecedence(StringBuilder sb, String expression, String resolvedExpression, String order, String nulls) {
-        sb.append(expression);
-        if (order != null) {
-            sb.append(' ').append(order);
-
-            if (nulls != null) {
-                sb.append(" NULLS ").append(nulls);
-            }
-        }
-    }
-
-    @Override
-    public String getOnClause() {
-        return "ON";
-    }
-
-    @Override
-    public String getCollectionValueFunction() {
-        return "VALUE";
-    }
-
-    @Override
-    public boolean supportsCollectionValueDereference() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryLimitOffset() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSetOperations() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsListagg() {
-        return false;
-    }
-
-    @Override
-    public Class<?> getDefaultQueryResultType() {
-        return null;
-    }
-
-    @Override
-    public String getCustomFunctionInvocation(String functionName, int argumentCount) {
-        // Careful, PaginatedCriteriaBuilder has some dependency on the "length" of the string for rendering in the count query
-        return functionName + "(";
-    }
-
-    @Override
-    public boolean supportsRootTreat() {
-        // Although it might parse, it isn't really supported for JOINED inheritance as wrong SQL is generated
-        // TODO: create an issue for this
-        return true;
-    }
-
-    @Override
-    public boolean supportsTreatJoin() {
-        return major >= 5;
-    }
-
-    @Override
-    public boolean supportsTreatCorrelation() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypePropertyResolving() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypeRelationResolving() {
-        // Interestingly, joining a relation that is only available on a subtype works
-        return true;
-    }
-
-    @Override
-    public boolean supportsCountStar() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCountTuple() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCustomFunctions() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonScalarSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryInFunction() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryAliasShadowing() {
-        return false;
-    }
-
-    @Override
-    public String[] getDiscriminatorColumnCheck(EntityType<?> entityType) {
-        return null;
-    }
-
-    @Override
-    public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
-        ManagedTypeImpl<?> managedType = (ManagedTypeImpl<?>) ownerType;
-        String[] parts = attributeName.split("\\.");
-        AbstractMemberMetaData metaData = managedType.getMetadata().getMetaDataForMember(parts[0]);
-        for (int i = 1; i < parts.length; i++) {
-            EmbeddedMetaData embeddedMetaData = metaData.getEmbeddedMetaData();
-            if (embeddedMetaData == null) {
-                // Probably trying to access the id attribute of a ToMany relation
-                return metaData.getJoinMetaData() != null;
-            } else {
-                AbstractMemberMetaData[] metaDatas = embeddedMetaData.getMemberMetaData();
-                metaData = null;
-                for (int j = 0; j < metaDatas.length; j++) {
-                    if (parts[i].equals(metaDatas[j].getName())) {
-                        metaData = metaDatas[j];
-                        break;
-                    }
-                }
-
-                if (metaData == null) {
-                    throw new IllegalArgumentException("Could not find property '" + parts[i] + "' in embeddable type: " + ((AbstractMemberMetaData) embeddedMetaData.getParent()).getType().getName());
-                }
-            }
-        }
-
-        return metaData.getJoinMetaData() != null;
-    }
-
-    @Override
-    public boolean isColumnShared(EntityType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attributeName, JoinType joinType) {
-        return ConstraintType.NONE;
-    }
-
-    @Override
-    public String getMappedBy(EntityType<?> ownerType, String attributeName) {
-        AbstractMemberMetaData metaData = getAttribute(ownerType, attributeName).getMetadata();
-        return metaData.getMappedBy();
-    }
-
-    @Override
-    public Map<String, String> getWritableMappedByMappings(EntityType<?> inverseType, EntityType<?> ownerType, String attributeName, String inverseAttribute) {
-        return null;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    private AttributeImpl<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
-        if (attributeName.indexOf('.') == -1) {
-            return (AttributeImpl<?, ?>) ownerType.getAttribute(attributeName);
-        }
-        ManagedType<?> t = ownerType;
-        Attribute<?, ?> attr = null;
-        String[] parts = attributeName.split("\\.");
-        for (int i = 0; i < parts.length; i++) {
-            attr = t.getAttribute(parts[i]);
-            Type<?> type;
-            if (attr instanceof PluralAttribute<?, ?, ?>) {
-                type = ((PluralAttribute<?, ?, ?>) attr).getElementType();
-            } else {
-                type = ((SingularAttribute<?, ?>) attr).getType();
-            }
-            if (type.getPersistenceType() != Type.PersistenceType.BASIC) {
-                t = (ManagedType<?>) type;
-            } else if (i + 1 != parts.length) {
-                throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-            }
-        }
-
-        return (AttributeImpl<?, ?>) attr;
-    }
-
-    @Override
-    public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        AbstractMemberMetaData metaData = attribute.getMetadata();
-        if (metaData.getJoinMetaData() != null) {
-            Map<String, String> keyMapping = null;
-            Map<String, String> keyColumnTypes = null;
-            KeyMetaData keyMetaData = metaData.getKeyMetaData();
-            if (keyMetaData != null && keyMetaData.getColumnMetaData() != null) {
-                keyMapping = new LinkedHashMap<>();
-                ColumnMetaData[] keyColumnMetaData = keyMetaData.getColumnMetaData();
-                ColumnMetaData[] keyTargetPrimaryKeyColumnMetaData = keyMetaData.getForeignKeyMetaData() == null ? null : keyMetaData.getForeignKeyMetaData().getColumnMetaData();
-                if (keyTargetPrimaryKeyColumnMetaData == null) {
-                    keyMapping.put(keyMetaData.getColumnName(), keyMetaData.getColumnName());
-                } else {
-                    for (int i = 0; i < keyTargetPrimaryKeyColumnMetaData.length; i++) {
-                        keyMapping.put(keyColumnMetaData[i].getName(), keyTargetPrimaryKeyColumnMetaData[i].getName());
-                    }
-                }
-            } else if (metaData.getOrderMetaData() != null) {
-                String columnName = metaData.getOrderMetaData().getColumnName();
-                if (columnName != null) {
-                    keyMapping = Collections.singletonMap(columnName, columnName);
-                }
-            }
-
-            String tableName;
-            Map<String, String> idColumnMapping;
-            Map<String, String> targetIdColumnMapping;
-            if (metaData.getJoinMetaData().getTable() == null) {
-                tableName = metaData.getTable();
-                ColumnMetaData[] joinMetaData;
-                ColumnMetaData[] elementMetaData;
-
-                if (metaData.getJoinMetaData() == null || (joinMetaData = metaData.getJoinMetaData().getColumnMetaData()) == null) {
-                    idColumnMapping = Collections.emptyMap();
-                } else {
-                    idColumnMapping = new LinkedHashMap<>(joinMetaData.length);
-                    for (int i = 0; i < joinMetaData.length; i++) {
-                        idColumnMapping.put(joinMetaData[i].getName(), joinMetaData[i].getTarget());
-                    }
-                }
-                if (metaData.getElementMetaData() == null || (elementMetaData = metaData.getElementMetaData().getColumnMetaData()) == null) {
-                    targetIdColumnMapping = Collections.emptyMap();
-                } else {
-                    targetIdColumnMapping = new LinkedHashMap<>(elementMetaData.length);
-                    for (int i = 0; i < elementMetaData.length; i++) {
-                        targetIdColumnMapping.put(elementMetaData[i].getName(), elementMetaData[i].getTarget());
-                    }
-                }
-            } else {
-                tableName = metaData.getJoinMetaData().getTable();
-                ColumnMetaData[] primaryKeyColumnMetaData = metaData.getJoinMetaData().getPrimaryKeyMetaData().getColumnMetaData();
-                ColumnMetaData[] foreignKeyColumnMetaData = metaData.getJoinMetaData().getForeignKeyMetaData().getColumnMetaData();
-                idColumnMapping = new LinkedHashMap<>(primaryKeyColumnMetaData.length);
-                for (int i = 0; i < foreignKeyColumnMetaData.length; i++) {
-                    idColumnMapping.put(foreignKeyColumnMetaData[i].getName(), primaryKeyColumnMetaData[i].getName());
-                }
-
-                ColumnMetaData[] targetColumnMetaData = metaData.getJoinMetaData().getColumnMetaData();
-                ColumnMetaData[] targetPrimaryKeyColumnMetaData = metaData.getElementMetaData().getForeignKeyMetaData().getColumnMetaData();
-                targetIdColumnMapping = new LinkedHashMap<>(targetPrimaryKeyColumnMetaData.length);
-
-                for (int i = 0; i < targetColumnMetaData.length; i++) {
-                    targetIdColumnMapping.put(targetColumnMetaData[i].getName(), targetPrimaryKeyColumnMetaData[i].getName());
-                }
-            }
-
-            return new JoinTable(
-                    tableName,
-                    null,
-                    idColumnMapping,
-                    keyMapping,
-                    keyColumnTypes,
-                    null,
-                    targetIdColumnMapping
-            );
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean isBag(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute instanceof PluralAttribute) {
-            PluralAttribute<?, ?, ?> pluralAttr = (PluralAttribute<?, ?, ?>) attribute;
-            if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.COLLECTION) {
-                return true;
-            } else if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.LIST) {
-                AbstractMemberMetaData metaData = attribute.getMetadata();
-                return metaData.getOrderMetaData() == null;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        return attribute != null && attribute.getMetadata().isCascadeRemoveOrphans();
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        return attribute != null && attribute.getMetadata().isCascadeDelete();
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean hasJoinCondition(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id) {
-        ExecutionContext ec = em.unwrap(ExecutionContext.class);
-        return ec.getAttachedObjectForId(ec.newObjectId(entityClass, id)) != null;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationIdExpressions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsForeignAssociationInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetEmbeddable() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetAssociationId() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTransientEntityAsParameter() {
-        return false;
-    }
-
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBrokenAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsTypeConstraintForColumnSharing() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCollectionTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsJoinTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCorrelationPredicateWhenCorrelatingWithWhereClause() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationNaturalIdExpressions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsGroupByEntityAlias() {
-        return true;
-    }
-
-    @Override
-    public boolean needsElementCollectionIdCutoff() {
-        return false;
-    }
-
-    @Override
-    public boolean needsUnproxyForFieldAccess() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCaseWhenElseBranch() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsLikePatternEscape() {
-        return true;
-    }
-
-    @Override
-    public void setCacheable(Query query) {
-        query.setHint("datanucleus.query.results.cached", true);
-    }
-
-    @Override
-    public void setSingularParameter(Query query, String name, Object value) {
-        query.setParameter(name, value);
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute.getType() instanceof EntityType<?>) {
-            EntityTypeImpl<?> entityType = (EntityTypeImpl<?>) attribute.getType();
-            if (entityType.hasSingleIdAttribute()) {
-                return Collections.singletonList(entityType.getId(entityType.getIdType().getJavaType()).getName());
-            } else {
-                Set<SingularAttribute<?, ?>> attributes = (Set<SingularAttribute<?, ?>>) (Set) entityType.getIdClassAttributes();
-                List<String> attributeNames = new ArrayList<>(attributes.size());
-
-                for (Attribute<?, ?> attr : attributes) {
-                    attributeNames.add(attr.getName());
-                }
-
-                return attributeNames;
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        ManagedType<?> t = ownerType;
-        Attribute<?, ?> attr = null;
-        String[] parts = attributeName.split("\\.");
-        for (int i = 0; i < parts.length; i++) {
-            attr = t.getAttribute(parts[i]);
-            if (attr instanceof SingularAttribute<?, ?>) {
-                SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-                if (singularAttribute.getType().getPersistenceType() != Type.PersistenceType.BASIC) {
-                    t = (ManagedType<?>) singularAttribute.getType();
-                } else if (i + 1 != parts.length) {
-                    throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-                }
-            } else {
-                PluralAttribute<?, ?, ?> pluralAttribute = (PluralAttribute<?, ?, ?>) attr;
-                if (pluralAttribute.getElementType().getPersistenceType() != Type.PersistenceType.BASIC) {
-                    t = (ManagedType<?>) pluralAttribute.getElementType();
-                } else if (i + 1 != parts.length) {
-                    throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-                }
-            }
-        }
-
-        EntityType<?> entityType = (EntityType<?>) t;
-
-        if (entityType.hasSingleIdAttribute()) {
-            return Collections.singletonList(entityType.getId(entityType.getIdType().getJavaType()).getName());
-        } else {
-            Set<SingularAttribute<?, ?>> attributes = (Set<SingularAttribute<?, ?>>) (Set) entityType.getIdClassAttributes();
-            List<String> attributeNames = new ArrayList<>(attributes.size());
-
-            for (Attribute<?, ?> attribute : attributes) {
-                attributeNames.add(attribute.getName());
-            }
-
-            return attributeNames;
-        }
-    }
-
-    @Override
-    public Map<String, String> getJoinMappingPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        List<String> keys;
-        if (elementCollectionPath == null) {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, attributeName);
-        } else {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, elementCollectionPath, attributeName);
-        }
-        Map<String, String> map = new LinkedHashMap<>(keys.size());
-        for (String key : keys) {
-            map.put(key, null);
-        }
-        return map;
-    }
-
-    @Override
-    public boolean supportsEnumLiteral(ManagedType<?> ownerType, String attributeName, boolean key) {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTemporalLiteral() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonDrivingAliasInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSelectCompositeIdEntityInSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyParameterForNonPkAssociation() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyRemove() {
-        return false;
-    }
-
-    @Override
-    public void initialize(Object entity) {
-        // Just call a method on the entity to trigger possible lazy initialization
-        entity.hashCode();
-    }
-
-    @Override
-    public Object getIdentifier(Object entity) {
-        Object identifier = persistenceUnitUtil.getIdentifier(entity);
-        // DataNucleus 4 returns a SingleFieldId object here instead of the real object...
-        if (identifier instanceof SingleFieldId<?>) {
-            return ((SingleFieldId<?>) identifier).getKeyAsObject();
-        }
-        return identifier;
-    }
-
-    @Override
-    public <T> T unproxy(T entity) {
-        // DataNucleus doesn't support proxies, but only enhancement
-        return entity;
-    }
-
-    @Override
-    public JpaMetamodelAccessor getJpaMetamodelAccessor() {
-        return DataNucleusJpaMetamodelAccessor.INSTANCE;
-    }
-
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
deleted file mode 100644
index 7da43c1eb4..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/AbstractJpqlFunctionSQLMethod.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
-import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
-import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
-import org.datanucleus.store.rdbms.sql.expression.EnumExpression;
-import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.expression.StringExpression;
-import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-import org.datanucleus.store.rdbms.sql.method.SimpleOrderableAggregateMethod;
-
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public abstract class AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    private static final Logger LOG = Logger.getLogger(JpqlFunctionSQLMethod.class.getName());
-    protected final SQLStatement stmt;
-    protected final SQLMethod function;
-
-    public AbstractJpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
-        this.stmt = stmt;
-        this.function = function;
-    }
-
-    @Override
-    public boolean hasArguments() {
-        // Not sure how to determine that
-        return true;
-    }
-
-    @Override
-    public boolean hasParenthesesIfNoArguments() {
-        // Not sure how to determine that
-        return true;
-    }
-
-    @Override
-    public Class<?> getReturnType(Class<?> firstArgumentType) {
-        if (firstArgumentType == null) {
-            return null;
-        }
-        SQLExpression expression;
-        JavaTypeMapping argumentTypeMapping = stmt.getSQLExpressionFactory().getMappingForType(firstArgumentType, true);
-        if (java.sql.Date.class.isAssignableFrom(firstArgumentType)) {
-            expression = new TemporalExpression(stmt, argumentTypeMapping, "", null);
-        } else if (Byte.class.isAssignableFrom(firstArgumentType)) {
-            expression = new ByteExpression(stmt, null, argumentTypeMapping);
-        } else if (Number.class.isAssignableFrom(firstArgumentType)) {
-            expression = new NumericExpression(stmt, argumentTypeMapping, "");
-        } else if (String.class.isAssignableFrom(firstArgumentType)) {
-            expression = new StringExpression(stmt, null, argumentTypeMapping);
-        } else if (Character.class.isAssignableFrom(firstArgumentType)) {
-            expression = new CharacterExpression(stmt, null, argumentTypeMapping);
-        } else if (Boolean.class.isAssignableFrom(firstArgumentType)) {
-            expression = new BooleanExpression(stmt, argumentTypeMapping, "");
-        } else if (firstArgumentType.isEnum()) {
-            // DataNucleus needs a table to handle aggregates on enums, so we just assume the aggregate will be MIN/MAX
-            if (function instanceof SimpleOrderableAggregateMethod) {
-                return firstArgumentType;
-            }
-            expression = new EnumExpression(stmt, null, argumentTypeMapping);
-        } else {
-            throw new UnsupportedOperationException("Unsupported data type: " + firstArgumentType.getName());
-        }
-        // Well, since the method is a singleton object doing this is actually a concurrency problem
-        // But when you look into the datanucleus code it has many data races so you are probably used to it anyway
-        function.setStatement(stmt);
-        SQLExpression resultExpression = getExpression(expression);
-        return resultExpression.getJavaTypeMapping().getJavaType();
-    }
-
-    protected abstract SQLExpression getExpression(SQLExpression argumentExpression);
-
-    @Override
-    public void render(FunctionRenderContext context) {
-        throw new UnsupportedOperationException("Rendering functions through this API is not possible!");
-    }
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
deleted file mode 100644
index aad17dcbc8..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/CustomSQLText.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import org.datanucleus.store.rdbms.sql.SQLText;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSQLText extends SQLText {
-
-    private final String sql;
-
-    public CustomSQLText(String sql, SQLExpression expr, List<SQLExpression> expressions) {
-        this.sql = sql;
-        
-        if (expr != null) {
-            append(expr);
-        }
-
-        for (SQLExpression expression : expressions) {
-            append(expression);
-        }
-    }
-
-    @Override
-    public String toSQL() {
-        // Call super to trigger parameter handling
-        super.toSQL();
-        return sql;
-    }
-    
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusEntityManagerFactoryIntegrator.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusEntityManagerFactoryIntegrator.java
deleted file mode 100644
index 41f7c77945..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusEntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.datanucleus.DataNucleusJpaProvider;
-import com.blazebit.persistence.integration.jpa.function.CountStarFunction;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import com.blazebit.persistence.spi.JpqlFunction;
-import com.blazebit.persistence.spi.JpqlFunctionGroup;
-import org.datanucleus.NucleusContext;
-import org.datanucleus.store.StoreManager;
-import org.datanucleus.store.rdbms.RDBMSStoreManager;
-import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
-import org.datanucleus.store.rdbms.identifier.DatastoreIdentifier;
-import org.datanucleus.store.rdbms.query.QueryGenerator;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpressionFactory;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-import org.datanucleus.store.rdbms.table.Table;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Proxy;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian Beikov
- * @author Moritz Becker
- *
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class DataNucleusEntityManagerFactoryIntegrator implements EntityManagerFactoryIntegrator {
-
-    public static final String VERSION;
-    public static final int MAJOR;
-    public static final int MINOR;
-    public static final int FIX;
-
-    private static final Logger LOG = Logger.getLogger(DataNucleusEntityManagerFactoryIntegrator.class.getName());
-    private static final Map<String, String> VENDOR_TO_DBMS_MAPPING = new HashMap<String, String>();
-    
-    static {
-        VENDOR_TO_DBMS_MAPPING.put("h2", "h2");
-        VENDOR_TO_DBMS_MAPPING.put("mysql", "mysql");
-        VENDOR_TO_DBMS_MAPPING.put("db2", "db2");
-        VENDOR_TO_DBMS_MAPPING.put("firebird", "firebird");
-        VENDOR_TO_DBMS_MAPPING.put("postgresql", "postgresql");
-        VENDOR_TO_DBMS_MAPPING.put("oracle", "oracle");
-        VENDOR_TO_DBMS_MAPPING.put("sqlite", "sqlite");
-        VENDOR_TO_DBMS_MAPPING.put("sqlserver", "microsoft");
-        VENDOR_TO_DBMS_MAPPING.put("sybase", "sybase");
-//        VENDOR_TO_DBMS_MAPPING.put("", "cubrid");
-        VENDOR_TO_DBMS_MAPPING.put("hsql", "hsql");
-        VENDOR_TO_DBMS_MAPPING.put("informix", "informix");
-//        VENDOR_TO_DBMS_MAPPING.put("", "ingres");
-//        VENDOR_TO_DBMS_MAPPING.put("", "interbase");
-
-        VERSION = readMavenPropertiesVersion("META-INF/maven/org.datanucleus/datanucleus-core/pom.properties");
-
-        String[] versionParts = VERSION.split("[\\.-]");
-        MAJOR = Integer.parseInt(versionParts[0]);
-        MINOR = Integer.parseInt(versionParts[1]);
-        FIX = Integer.parseInt(versionParts[2]);
-    }
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        DatastoreAdapter datastoreAdapter = storeMgr.getDatastoreAdapter();
-        String vendorID = datastoreAdapter.getVendorID();
-        if ("mysql".equals(vendorID)) {
-            String datastoreProductVersion = datastoreAdapter.getDatastoreProductVersion();
-            if (Integer.parseInt(datastoreProductVersion.substring(0, datastoreProductVersion.indexOf('.'))) > 7) {
-                return "mysql8";
-            }
-        }
-        return VENDOR_TO_DBMS_MAPPING.get(vendorID);
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                return new DataNucleusJpaProvider(persistenceUnitUtil, MAJOR, MINOR, FIX);
-            }
-        };
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public EntityManagerFactory registerFunctions(EntityManagerFactory entityManagerFactory, Map<String, JpqlFunctionGroup> dbmsFunctions) {
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
-        String dbms = VENDOR_TO_DBMS_MAPPING.get(storeMgr.getDatastoreAdapter().getVendorID());
-
-        // Register compatibility functions
-        if (!exprFactory.isMethodRegistered(null, CountStarFunction.FUNCTION_NAME)) {
-            exprFactory.registerMethod(null, CountStarFunction.FUNCTION_NAME, new DataNucleusJpqlFunctionAdapter(new CountStarFunction(), true), true);
-        }
-
-        // DataNucleus4 uses a month function that is 0 based which conflicts with ANSI EXTRACT(MONTH)
-        if (MAJOR < 5 && !(exprFactory.getMethod("java.util.Date", "getMonth", null) instanceof DataNucleusJpqlFunctionAdapter)) {
-            LOG.warning("Overriding DataNucleus native 'MONTH' function to return months 1-based like ANSI EXTRACT instead of 0-based!");
-            
-            JpqlFunctionGroup dbmsFunctionGroup = dbmsFunctions.get("month");
-            JpqlFunction function = dbmsFunctionGroup.get(dbms);
-            
-            if (function == null && !dbmsFunctionGroup.contains(dbms)) {
-                function = dbmsFunctionGroup.get(null);
-            }
-            
-            SQLMethod method = new DataNucleusJpqlFunctionAdapter(function, dbmsFunctionGroup.isAggregate());
-            Set<Object> methodKeys = fieldGet("methodNamesSupported", exprFactory, VERSION);
-
-            for (Object methodKey : methodKeys) {
-                if ("getMonth".equals((String) fieldGet("methodName", methodKey, VERSION)) && "java.util.Date".equals((String) fieldGet("clsName", methodKey, VERSION))) {
-                    ((Map<Object, Object>) fieldGet("methodByClassMethodName", exprFactory, VERSION)).put(methodKey, method);
-                }
-            }
-        }
-
-        // construct map for checking existence of functions in a case-insensitive way
-        Map<String, JpqlFunction> registeredFunctions = getRegisteredFunctions(entityManagerFactory);
-        Map<String, String> caseInsensitiveRegisteredFunctions = new HashMap<>(registeredFunctions.size());
-        for (String registeredFunctionName : registeredFunctions.keySet()) {
-            caseInsensitiveRegisteredFunctions.put(registeredFunctionName.toLowerCase(), registeredFunctionName);
-        }
-
-        for (Map.Entry<String, JpqlFunctionGroup> functionEntry : dbmsFunctions.entrySet()) {
-            String functionName = functionEntry.getKey();
-            JpqlFunctionGroup dbmsFunctionGroup = functionEntry.getValue();
-            JpqlFunction function = dbmsFunctionGroup.get(dbms);
-            
-            if (function == null && !dbmsFunctionGroup.contains(dbms)) {
-                function = dbmsFunctionGroup.get(null);
-            }
-            if (function == null) {
-                LOG.warning("Could not register the function '" + functionName + "' because there is neither an implementation for the dbms '" + dbms + "' nor a default implementation!");
-            } else if (!caseInsensitiveRegisteredFunctions.containsKey(functionName.toLowerCase())) {
-                exprFactory.registerMethod(null, functionName, new DataNucleusJpqlFunctionAdapter(function, dbmsFunctionGroup.isAggregate()), true);
-            }
-        }
-        
-        return entityManagerFactory;
-    }
-
-    @Override
-    public Map<String, JpqlFunction> getRegisteredFunctions(EntityManagerFactory entityManagerFactory) {
-        NucleusContext context = entityManagerFactory.unwrap(NucleusContext.class);
-        RDBMSStoreManager storeMgr = (RDBMSStoreManager) entityManagerFactory.unwrap(StoreManager.class);
-        String storeName = storeMgr.getDatastoreAdapter().getVendorID();
-        SQLExpressionFactory exprFactory = storeMgr.getSQLExpressionFactory();
-        
-        Set<Object> methodKeys = fieldGet("methodNamesSupported", exprFactory, VERSION);
-        
-        if (methodKeys.isEmpty()) {
-            return new HashMap<>();
-        }
-
-        Map<String, JpqlFunction> functions = new HashMap<>();
-
-        // We need to construct a statement object and how this is done changed between 4 and 5 so we have to do a little reflection hack
-        // We need this because the function methods retrieve the expression factory through it
-        Class<?>[] parameterTypes = {RDBMSStoreManager.class, Table.class, DatastoreIdentifier.class, String.class};
-        SQLStatement stmt;
-
-        try {
-            Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SelectStatement").getConstructor(parameterTypes);
-            stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
-        } catch (Exception e) {
-            try {
-                Constructor c = Class.forName("org.datanucleus.store.rdbms.sql.SQLStatement").getConstructor(parameterTypes);
-                stmt = (SQLStatement) c.newInstance(storeMgr, null, null, null);
-            } catch (Exception e2) {
-                throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + VERSION + ") so we can provide support for it!", e2);
-            }
-        }
-
-        // Well apparently expressions get their class loader resolver by asking the statement they are part of
-        // which in turn asks the query generator that is responsible for it
-        // So this is the most non-hackish way to get this to work...
-        QueryGenerator noopGenerator = (QueryGenerator) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ QueryGenerator.class }, new QueryGeneratorInvocationHandler(context));
-        stmt.setQueryGenerator(noopGenerator);
-        
-        for (Object methodKey : methodKeys) {
-            String className = fieldGet("clsName", methodKey, VERSION);
-            String datastoreName = fieldGet("datastoreName", methodKey, VERSION);
-            String name = fieldGet("methodName", methodKey, VERSION);
-            if (className.isEmpty()
-                    && name.indexOf('.') == -1
-                    && ("ALL".equals(datastoreName) || storeName.equals(datastoreName))) {
-                // Only consider normal functions
-                SQLMethod method = exprFactory.getMethod(null, name, Collections.emptyList());
-                if (method instanceof DataNucleusJpqlFunctionAdapter) {
-                    functions.put(name, ((DataNucleusJpqlFunctionAdapter) method).unwrap());
-                } else {
-                    functions.put(name, new JpqlFunctionSQLMethod(stmt, method));
-                }
-            }
-        }
-
-        // The length function is the single exception to all functions that is based on a class
-        SQLMethod method = exprFactory.getMethod("java.lang.String", "length", Collections.emptyList());
-        functions.put("length", new JpqlFunctionInstanceSQLMethod(stmt, method));
-        
-        return functions;
-    }
-    
-    private static String readMavenPropertiesVersion(String name) {
-        InputStream is = null;
-        try {
-            is = NucleusContext.class.getClassLoader().getResourceAsStream(name);
-            Properties p = new Properties();
-            p.load(is);
-            return p.getProperty("version");
-        } catch (IOException e) {
-            throw new RuntimeException("Could not access the maven version properties of datanucleus!", e);
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    // Ignore
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T fieldGet(String fieldName, Object value, String version) {
-        Exception ex;
-        Field field = null;
-        boolean madeAccessible = false;
-        
-        try {
-            field = value.getClass().getDeclaredField(fieldName);
-            madeAccessible = !field.isAccessible();
-            
-            if (madeAccessible) {
-                field.setAccessible(true);
-            }
-            
-            return (T) field.get(value);
-        } catch (NoSuchFieldException e) {
-            ex = e;
-        } catch (SecurityException e) {
-            ex = e;
-        } catch (IllegalArgumentException e) {
-            ex = e;
-        } catch (IllegalAccessException e) {
-            ex = e;
-        } finally {
-            if (madeAccessible) {
-                field.setAccessible(false);
-            }
-        }
-        
-        throw new RuntimeException("Could not access the required methods to dynamically retrieve registered functions. Please report this version of datanucleus(" + version + ") so we can provide support for it!", ex);
-    }
-    
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
deleted file mode 100644
index 8e2102e8e1..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusFunctionRenderContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-
-import java.util.List;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class DataNucleusFunctionRenderContext implements FunctionRenderContext {
-    
-    private final StringBuilder sb = new StringBuilder();
-    private final List<?> arguments;
-
-    public DataNucleusFunctionRenderContext(List<?> arguments) {
-        this.arguments = arguments;
-    }
-
-    @Override
-    public int getArgumentsSize() {
-        return arguments.size();
-    }
-
-    @Override
-    public String getArgument(int index) {
-        return arguments.get(index).toString();
-    }
-
-    @Override
-    public void addArgument(int index) {
-        sb.append(arguments.get(index));
-    }
-
-    @Override
-    public void addChunk(String chunk) {
-        sb.append(chunk);
-    }
-    
-    public String renderToString() {
-        return sb.toString();
-    }
-
-    @Override
-    public String toString() {
-        return "HibernateFunctionRenderContext{" + "arguments=" + arguments + '}';
-    }
-    
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
deleted file mode 100644
index c4f71267bd..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/DataNucleusJpqlFunctionAdapter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.mapping.java.TemporalMapping;
-import org.datanucleus.store.rdbms.sql.SQLText;
-import org.datanucleus.store.rdbms.sql.expression.AggregateNumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.AggregateStringExpression;
-import org.datanucleus.store.rdbms.sql.expression.AggregateTemporalExpression;
-import org.datanucleus.store.rdbms.sql.expression.BooleanExpression;
-import org.datanucleus.store.rdbms.sql.expression.ByteExpression;
-import org.datanucleus.store.rdbms.sql.expression.CharacterExpression;
-import org.datanucleus.store.rdbms.sql.expression.NumericExpression;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.expression.StringExpression;
-import org.datanucleus.store.rdbms.sql.expression.TemporalExpression;
-import org.datanucleus.store.rdbms.sql.method.AbstractSQLMethod;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class DataNucleusJpqlFunctionAdapter extends AbstractSQLMethod {
-    
-    private static final Logger LOG = Logger.getLogger(DataNucleusJpqlFunctionAdapter.class.getName());
-    private final JpqlFunction function;
-    private final boolean aggregate;
-
-    public DataNucleusJpqlFunctionAdapter(JpqlFunction function, boolean aggregate) {
-        this.function = function;
-        this.aggregate = aggregate;
-    }
-
-    public JpqlFunction unwrap() {
-        return function;
-    }
-
-    @Override
-    public SQLExpression getExpression(SQLExpression expr, List<SQLExpression> args) {
-        // NOTE: expr will be the first argument for class methods like getMonth!
-        int argsSize = args.size();
-        List<String> newArgs = new ArrayList<String>(argsSize + (expr == null ? 0 : 1));
-        Class<?> firstArgumentType = null;
-        JavaTypeMapping firstArgumentTypeMapping = null;
-        
-        if (expr != null) {
-            firstArgumentTypeMapping = expr.getJavaTypeMapping();
-            firstArgumentType = firstArgumentTypeMapping.getJavaType();
-            newArgs.add(expr.toSQLText().toSQL());
-            for (int i = 0; i < argsSize; i++) {
-                newArgs.add(args.get(i).toSQLText().toSQL());
-            }
-        } else if (argsSize > 0) {
-            firstArgumentTypeMapping = args.get(0).getJavaTypeMapping();
-            firstArgumentType = firstArgumentTypeMapping.getJavaType();
-            newArgs.add(args.get(0).toSQLText().toSQL());
-            for (int i = 1; i < argsSize; i++) {
-                newArgs.add(args.get(i).toSQLText().toSQL());
-            }
-        }
-        
-        Class<?> returnType = function.getReturnType(firstArgumentType);
-        JavaTypeMapping returnTypeMapping;
-        
-        if (returnType == firstArgumentType) {
-            returnTypeMapping = firstArgumentTypeMapping;
-        } else {
-            returnTypeMapping = getMappingForClass(returnType);
-        }
-        
-        if (returnTypeMapping == null) {
-            throw new IllegalArgumentException("Invalid return type null returned from function: " + function);
-        }
-        
-        final DataNucleusFunctionRenderContext context = new DataNucleusFunctionRenderContext(newArgs);
-        function.render(context);
-        
-        final SQLText sqlText = new CustomSQLText(context.renderToString(), expr, args);
-        
-        if (aggregate) {
-            if (returnTypeMapping instanceof TemporalMapping) {
-                return new AggregateTemporalExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new AggregateNumericExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new AggregateStringExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else {
-                LOG.warning("Aggregate type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
-            }
-        } else {
-            if (returnTypeMapping instanceof TemporalMapping) {
-                return new TemporalExpression(stmt, returnTypeMapping, "", null) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Byte.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new ByteExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Number.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new NumericExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (String.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new StringExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Character.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new CharacterExpression(stmt, null, returnTypeMapping) {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else if (Boolean.class.isAssignableFrom(returnTypeMapping.getJavaType())) {
-                return new BooleanExpression(stmt, returnTypeMapping, "") {
-                    @Override
-                    public SQLText toSQLText() {
-                        return sqlText;
-                    }
-                };
-            } else {
-                LOG.warning("Type [" + returnType + "] could not be represented as aggregate. Please report this so we can support the type! Falling back to normal expression.");
-            }
-        }
-        
-        return new SQLExpression(stmt, null, returnTypeMapping) {
-            @Override
-            public SQLText toSQLText() {
-                return sqlText;
-            }
-        };
-    }
-
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
deleted file mode 100644
index baca8a3efe..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionInstanceSQLMethod.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-
-import java.util.Collections;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JpqlFunctionInstanceSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    public JpqlFunctionInstanceSQLMethod(SQLStatement stmt, SQLMethod function) {
-        super(stmt, function);
-    }
-
-    @Override
-    protected SQLExpression getExpression(SQLExpression argumentExpression) {
-        return function.getExpression(argumentExpression, Collections.EMPTY_LIST);
-    }
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
deleted file mode 100644
index 8412e84078..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/JpqlFunctionSQLMethod.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.datanucleus.store.rdbms.sql.SQLStatement;
-import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
-import org.datanucleus.store.rdbms.sql.method.SQLMethod;
-
-import java.util.Arrays;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public class JpqlFunctionSQLMethod extends AbstractJpqlFunctionSQLMethod implements JpqlFunction {
-
-    public JpqlFunctionSQLMethod(SQLStatement stmt, SQLMethod function) {
-        super(stmt, function);
-    }
-
-    @Override
-    protected SQLExpression getExpression(SQLExpression argumentExpression) {
-        return function.getExpression(null, Arrays.asList(argumentExpression));
-    }
-}
diff --git a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java b/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
deleted file mode 100644
index 0bab27f7e7..0000000000
--- a/integration/datanucleus/src/main/java/com/blazebit/persistence/integration/datanucleus/function/QueryGeneratorInvocationHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.datanucleus.function;
-
-import org.datanucleus.NucleusContext;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- *
- * @author Christian
- * @since 1.2.0
- */
-public class QueryGeneratorInvocationHandler implements InvocationHandler {
-
-    private final NucleusContext context;
-
-    public QueryGeneratorInvocationHandler(NucleusContext context) {
-        this.context = context;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getClassLoaderResolver".equals(method.getName())) {
-            return context.getClassLoaderResolver(null);
-        }
-        return null;
-    }
-}
diff --git a/integration/datanucleus/src/main/resources/META-INF/MANIFEST.MF b/integration/datanucleus/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 4b3b8d80bb..0000000000
--- a/integration/datanucleus/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: blaze-persistence-integration-datanucleus
-Bundle-SymbolicName: com.blazebit.blaze-persistence-integration-datanucleus
-Bundle-Version: 1.0.0
-Bundle-Vendor: Blazebit
-Require-Bundle: org.datanucleus,org.datanucleus.api.jpa
diff --git a/integration/datanucleus/src/main/resources/plugin.xml b/integration/datanucleus/src/main/resources/plugin.xml
deleted file mode 100644
index d60bc670f4..0000000000
--- a/integration/datanucleus/src/main/resources/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<plugin id="com.blazebit.persistence" name="Blaze-Persistence DataNucleus plugin" provider-name="Blazebit">
-    <extension point="org.datanucleus.annotations">
-        <annotations annotation-class="com.blazebit.persistence.CTE" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Entity" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.MappedSuperclass" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Embeddable" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedNativeQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedNativeQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedStoredProcedureQuery" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.NamedStoredProcedureQueries" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="org.datanucleus.api.jpa.annotations.PersistenceAware" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-        <annotations annotation-class="javax.persistence.Converter" reader="com.blazebit.persistence.integration.datanucleus.CTEAnnotationReader"/>
-    </extension>
-</plugin>
\ No newline at end of file
diff --git a/integration/deltaspike-data/api/pom.xml b/integration/deltaspike-data/api/pom.xml
index 503f88abd9..3e9dcfc9df 100644
--- a/integration/deltaspike-data/api/pom.xml
+++ b/integration/deltaspike-data/api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.apache.deltaspike.distribution</groupId>
                 <artifactId>distributions-bom</artifactId>
-                <version>${version.deltaspike-1.7}</version>
+                <version>${version.deltaspike-2.0}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -30,9 +30,28 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -45,36 +64,4 @@
             <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires jakarta.enterprise.cdi.api;
-                                        requires com.blazebit.persistence.view;
-                                        requires deltaspike.data.module.api;
-                                        exports com.blazebit.persistence.deltaspike.data;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/EntityViewRepository.java b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/EntityViewRepository.java
index 0ed955f4c8..3f6bcdbad8 100644
--- a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/EntityViewRepository.java
+++ b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/EntityViewRepository.java
@@ -7,7 +7,7 @@
 
 import org.apache.deltaspike.core.spi.activation.Deactivatable;
 
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.io.Serializable;
 import java.util.List;
 
@@ -24,7 +24,7 @@
 public interface EntityViewRepository<E, V, PK extends Serializable> extends Deactivatable {
     /**
      * Entity lookup by primary key. Convenicence method around
-     * {@link javax.persistence.EntityManager#find(Class, Object)}.
+     * {@link jakarta.persistence.EntityManager#find(Class, Object)}.
      * @param primaryKey        DB primary key.
      * @return                  Entity identified by primary or null if it does not exist.
      */
diff --git a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/ExtendedQueryResult.java b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/ExtendedQueryResult.java
index 918950dfb6..6846d1af13 100644
--- a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/ExtendedQueryResult.java
+++ b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/ExtendedQueryResult.java
@@ -8,9 +8,9 @@
 import com.blazebit.persistence.PagedList;
 import org.apache.deltaspike.data.api.QueryResult;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.List;
 
 /**
diff --git a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/Specification.java b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/Specification.java
index 9b169aac36..6a3c81351c 100644
--- a/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/Specification.java
+++ b/integration/deltaspike-data/api/src/main/java/com/blazebit/persistence/deltaspike/data/Specification.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.deltaspike.data;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 /**
  * A type to represent a specific view on data, heavily inspired by Spring Data's <code>Specification</code>.
diff --git a/integration/deltaspike-data/api/src/main/java/module-info.java b/integration/deltaspike-data/api/src/main/java/module-info.java
new file mode 100644
index 0000000000..96ec3b908d
--- /dev/null
+++ b/integration/deltaspike-data/api/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.deltaspike.data {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires jakarta.cdi;
+	requires com.blazebit.persistence.view;
+	requires deltaspike.data.module.api;
+	requires deltaspike.core.api;
+	exports com.blazebit.persistence.deltaspike.data;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/base/pom.xml b/integration/deltaspike-data/base/pom.xml
index 92833d8c5b..f99857255d 100644
--- a/integration/deltaspike-data/base/pom.xml
+++ b/integration/deltaspike-data/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -30,9 +30,28 @@
             <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,118 +79,11 @@
             <artifactId>deltaspike-partial-bean-module-impl</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive java.enterprise.inject;
-                                        requires transitive com.blazebit.persistence.criteria.impl;
-                                        requires transitive deltaspike.data.module.api;
-                                        requires transitive deltaspike.data.module.impl;
-                                        exports com.blazebit.persistence.deltaspike.data.base.builder;
-                                        exports com.blazebit.persistence.deltaspike.data.base.builder.part;
-                                        exports com.blazebit.persistence.deltaspike.data.base.builder.postprocessor;
-                                        exports com.blazebit.persistence.deltaspike.data.base.criteria;
-                                        exports com.blazebit.persistence.deltaspike.data.base.handler;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <profiles>
         <profile>
-            <id>deltaspike-1.7</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.7}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.8</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.8}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.9</id>
+            <id>deltaspike-2.0</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -180,7 +92,7 @@
                     <dependency>
                         <groupId>org.apache.deltaspike.distribution</groupId>
                         <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.9}</version>
+                        <version>${version.deltaspike-2.0}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/CompoundOperatorSpecification.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/CompoundOperatorSpecification.java
index 0b01531bf5..b69ea791ea 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/CompoundOperatorSpecification.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/CompoundOperatorSpecification.java
@@ -7,10 +7,10 @@
 
 import com.blazebit.persistence.deltaspike.data.Specification;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/OrderByQueryAttribute.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/OrderByQueryAttribute.java
index 5ad8fff93b..13d83d5214 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/OrderByQueryAttribute.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/OrderByQueryAttribute.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Root;
 
 import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
 import static org.apache.deltaspike.data.impl.util.QueryUtils.uncapitalize;
@@ -42,7 +42,7 @@ public void buildQuery(CriteriaBuilder<?> cb) {
         }
     }
 
-    public Order buildOrder(Root<?> root, javax.persistence.criteria.CriteriaBuilder cb) {
+    public Order buildOrder(Root<?> root, jakarta.persistence.criteria.CriteriaBuilder cb) {
         switch (direction) {
             case DESC:
                 return cb.desc(root.get(EntityViewBasePropertyQueryPart.rewriteSeparator(attribute)));
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/QueryOperatorSpecification.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/QueryOperatorSpecification.java
index 58f19e5004..dbc1490871 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/QueryOperatorSpecification.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/part/QueryOperatorSpecification.java
@@ -7,11 +7,11 @@
 
 import com.blazebit.persistence.deltaspike.data.Specification;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 /**
  *
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/CountCriteriaBuilderQueryCreator.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/CountCriteriaBuilderQueryCreator.java
index 782e7bf2e9..42e4fe944a 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/CountCriteriaBuilderQueryCreator.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/CountCriteriaBuilderQueryCreator.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.FullQueryBuilder;
 import com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderQueryCreator;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  * @author Christian Beikov
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
index 634461c40f..fa42952459 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/builder/postprocessor/OrderByCriteriaBuilderPostProcessor.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor;
 import org.apache.deltaspike.data.impl.builder.OrderDirection;
 
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
  * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.OrderByQueryStringPostProcessor}
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/criteria/QueryCriteria.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/criteria/QueryCriteria.java
index 169f2406e0..5c14df1856 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/criteria/QueryCriteria.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/criteria/QueryCriteria.java
@@ -16,13 +16,13 @@
 import org.apache.deltaspike.data.impl.criteria.predicate.PredicateBuilder;
 import org.apache.deltaspike.data.impl.criteria.processor.QueryProcessor;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/AbstractEntityViewAwareRepositoryHandler.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/AbstractEntityViewAwareRepositoryHandler.java
index 9708435623..bfb744150e 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/AbstractEntityViewAwareRepositoryHandler.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/AbstractEntityViewAwareRepositoryHandler.java
@@ -30,12 +30,12 @@
 import org.apache.deltaspike.data.impl.property.query.PropertyQueries;
 import org.apache.deltaspike.data.impl.util.jpa.PersistenceUnitUtilDelegateFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/CriteriaBuilderQueryCreator.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/CriteriaBuilderQueryCreator.java
index d2c60639c5..d325aa8fe9 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/CriteriaBuilderQueryCreator.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/CriteriaBuilderQueryCreator.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.FullQueryBuilder;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  * @author Christian Beikov
diff --git a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/EntityViewContext.java b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/EntityViewContext.java
index 8c74e9b258..a0e4e35f19 100644
--- a/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/EntityViewContext.java
+++ b/integration/deltaspike-data/base/src/main/java/com/blazebit/persistence/deltaspike/data/base/handler/EntityViewContext.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.deltaspike.data.base.handler;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/integration/deltaspike-data/base/src/main/java/module-info.java b/integration/deltaspike-data/base/src/main/java/module-info.java
new file mode 100644
index 0000000000..73aa3f8e97
--- /dev/null
+++ b/integration/deltaspike-data/base/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.deltaspike.data.base {
+	requires transitive jakarta.inject;
+	requires transitive deltaspike.core.api;
+	requires transitive com.blazebit.persistence.view;
+	requires transitive com.blazebit.persistence.criteria.impl;
+	requires transitive deltaspike.data.module.api;
+	requires transitive deltaspike.data.module.impl;
+	requires transitive com.blazebit.persistence.integration.deltaspike.data;
+	exports com.blazebit.persistence.deltaspike.data.base.builder;
+	exports com.blazebit.persistence.deltaspike.data.base.builder.part;
+	exports com.blazebit.persistence.deltaspike.data.base.builder.postprocessor;
+	exports com.blazebit.persistence.deltaspike.data.base.criteria;
+	exports com.blazebit.persistence.deltaspike.data.base.handler;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/pom.xml b/integration/deltaspike-data/impl-1.7/pom.xml
deleted file mode 100644
index 66700890df..0000000000
--- a/integration/deltaspike-data/impl-1.7/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
-
-    <name>Blazebit Persistence Integration DeltaSpike Data Impl 1.7</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.deltaspike.data.impl</module.name>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.deltaspike.distribution</groupId>
-                <artifactId>distributions-bom</artifactId>
-                <version>${version.deltaspike-1.7}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.core</groupId>
-            <artifactId>deltaspike-core-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-data-module-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-data-module-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-partial-bean-module-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.deltaspike.data;
-                                        exports com.blazebit.persistence.deltaspike.data.impl;
-                                        provides javax.enterprise.inject.spi.Extension with com.blazebit.persistence.deltaspike.data.impl.EntityViewRepositoryExtension;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
deleted file mode 100644
index 490ccb38f5..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.apache.deltaspike.data.api.Repository;
-import org.apache.deltaspike.data.impl.handler.QueryHandler;
-import org.apache.deltaspike.partialbean.impl.PartialBeanBindingExtension;
-import org.apache.deltaspike.partialbean.impl.PartialBeanDescriptor;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Modifier;
-import java.util.Map;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ServiceProvider(Extension.class)
-public class CustomPartialBeanBindingExtension extends PartialBeanBindingExtension {
-
-    private boolean isActivated() {
-        try {
-            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("isActivated");
-            descriptorsField.setAccessible(true);
-            return (boolean) descriptorsField.get(this);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Map<Class<? extends Annotation>, PartialBeanDescriptor> getDescriptors() {
-        try {
-            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("descriptors");
-            descriptorsField.setAccessible(true);
-            return (Map<Class<? extends Annotation>, PartialBeanDescriptor>) descriptorsField.get(this);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private IllegalStateException getDefinitionError() {
-        try {
-            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("definitionError");
-            descriptorsField.setAccessible(true);
-            return (IllegalStateException) descriptorsField.get(this);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void setDefinitionError(IllegalStateException definitionError) {
-        try {
-            Field descriptorsField = PartialBeanBindingExtension.class.getDeclaredField("definitionError");
-            descriptorsField.setAccessible(true);
-            descriptorsField.set(this, definitionError);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <X> void findInvocationHandlerBindings(@Observes ProcessAnnotatedType<X> pat, BeanManager beanManager) {
-        if (isActivated() && getDefinitionError() == null) {
-            Map<Class<? extends Annotation>, PartialBeanDescriptor> descriptors = getDescriptors();
-            @SuppressWarnings("unchecked")
-            Class<? extends InvocationHandler> beanClass = (Class<? extends InvocationHandler>) pat.getAnnotatedType().getJavaClass();
-            Class<? extends Annotation> bindingClass = this.extractBindingClass(pat);
-            if (bindingClass != null) {
-                if (bindingClass.equals(Repository.class) && beanClass.equals(QueryHandler.class)) {
-                    return;
-                }
-                PartialBeanDescriptor descriptor;
-                if (!beanClass.isInterface() && !Modifier.isAbstract(beanClass.getModifiers())) {
-                    if (InvocationHandler.class.isAssignableFrom(beanClass)) {
-                        descriptor = descriptors.get(bindingClass);
-                        if (descriptor == null) {
-                            descriptor = new PartialBeanDescriptor(bindingClass, beanClass);
-                            descriptors.put(bindingClass, descriptor);
-                        } else if (descriptor.getHandler() == null) {
-                            descriptor.setHandler(beanClass);
-                        } else if (!descriptor.getHandler().equals(beanClass)) {
-                            setDefinitionError(new IllegalStateException("Multiple handlers found for " + bindingClass.getName() + " (" + descriptor.getHandler().getName() + " and " + beanClass.getName() + ")"));
-                        }
-                    } else {
-                        setDefinitionError(new IllegalStateException(beanClass.getName() + " is annotated with @" + bindingClass.getName() + " and therefore has to be " + "an abstract class, an interface or an implementation of " + InvocationHandler.class.getName()));
-                    }
-                } else {
-                    pat.veto();
-                    descriptor = descriptors.get(bindingClass);
-                    if (descriptor == null) {
-                        descriptor = new PartialBeanDescriptor(bindingClass, (Class<? extends InvocationHandler>) null, beanClass);
-                        descriptors.put(bindingClass, descriptor);
-                    } else if (!descriptor.getClasses().contains(beanClass)) {
-                        descriptor.getClasses().add(beanClass);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
deleted file mode 100644
index a107f6657e..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl;
-
-import org.apache.deltaspike.core.spi.activation.ClassDeactivator;
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import org.apache.deltaspike.data.impl.RepositoryExtension;
-import org.apache.deltaspike.partialbean.impl.PartialBeanBindingExtension;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class DeltaspikeExtensionDeactivator implements ClassDeactivator {
-    @Override
-    public Boolean isActivated(Class<? extends Deactivatable> aClass) {
-        return !(aClass.equals(RepositoryExtension.class) || aClass.equals(PartialBeanBindingExtension.class));
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java
deleted file mode 100644
index 1e00569a3d..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/EntityViewRepositoryExtension.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.deltaspike.data.EntityViewManagerConfig;
-import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponents;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import org.apache.deltaspike.data.api.AbstractEntityRepository;
-import org.apache.deltaspike.data.api.AbstractFullEntityRepository;
-import org.apache.deltaspike.data.api.Repository;
-import org.apache.deltaspike.data.impl.RepositoryDefinitionException;
-import org.apache.deltaspike.data.impl.meta.RepositoryComponents;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import java.lang.reflect.InvocationHandler;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.RepositoryExtension} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ServiceProvider(Extension.class)
-public class EntityViewRepositoryExtension implements Extension, Deactivatable {
-
-    private static final Logger LOG = Logger.getLogger(EntityViewRepositoryExtension.class.getName());
-
-    private static RepositoryComponents staticComponents = new RepositoryComponents();
-    private static EntityViewRepositoryComponents staticEntityViewRepositoryComponents = new EntityViewRepositoryComponents();
-
-    private final List<RepositoryDefinitionException> definitionExceptions = new LinkedList<>();
-
-    private Boolean isActivated = true;
-
-    private final Set<Class<?>> repoClasses = new HashSet<>();
-    private RepositoryComponents components = new RepositoryComponents();
-    private EntityViewRepositoryComponents entityViewRepositoryComponents = new EntityViewRepositoryComponents();
-
-    void beforeBeanDiscovery(@Observes BeforeBeanDiscovery before) {
-        isActivated = ClassDeactivationUtils.isActivated(getClass());
-    }
-
-    @SuppressWarnings("unchecked")
-    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> event) {
-        if (!isActivated) {
-            return;
-        }
-
-        if (isVetoed(event.getAnnotatedType())) {
-            event.veto();
-        } else if (isRepository(event.getAnnotatedType())) {
-            repoClasses.add(event.getAnnotatedType().getJavaClass());
-            LOG.log(Level.FINER, "getHandlerClass: Repository annotation detected on {0}",
-                    event.getAnnotatedType());
-        }
-    }
-
-    <X> void addDefinitionErrors(@Observes AfterDeploymentValidation afterDeploymentValidation, BeanManager beanManager) {
-        if (!isActivated) {
-            return;
-        }
-
-        Bean<?> entityViewManagerBean = beanManager.resolve(beanManager.getBeans(EntityViewManager.class));
-        EntityViewManager defaultEvm = (EntityViewManager) beanManager.getReference(entityViewManagerBean, EntityViewManager.class, beanManager.createCreationalContext(entityViewManagerBean));
-        for (Class<?> repoClass : repoClasses) {
-            try {
-                if (Deactivatable.class.isAssignableFrom(repoClass)
-                        && !ClassDeactivationUtils.isActivated((Class<? extends Deactivatable>) repoClass)) {
-                    LOG.log(Level.FINER, "Class {0} is Deactivated", repoClass);
-                    return;
-                }
-
-                EntityViewManagerConfig config = extractEntityViewManagerConfig(repoClass);
-                EntityViewManager configuredEvm;
-                if (config != null && !EntityViewManagerResolver.class.equals(config.entityViewManagerResolver())) {
-                    configuredEvm = resolveEntityViewManager(beanManager, config);
-                } else {
-                    configuredEvm = defaultEvm;
-                }
-
-                entityViewRepositoryComponents.add(repoClass, configuredEvm);
-                staticEntityViewRepositoryComponents.add(repoClass, configuredEvm);
-            } catch (RepositoryDefinitionException e) {
-                definitionExceptions.add(e);
-            } catch (Exception e) {
-                definitionExceptions.add(new RepositoryDefinitionException(repoClass, e));
-            }
-        }
-
-        for (RepositoryDefinitionException ex : definitionExceptions) {
-            afterDeploymentValidation.addDeploymentProblem(ex);
-        }
-    }
-
-    private EntityViewManagerConfig extractEntityViewManagerConfig(Class<?> clazz) {
-        if (clazz.isAnnotationPresent(EntityViewManagerConfig.class)) {
-            return clazz.getAnnotation(EntityViewManagerConfig.class);
-        }
-        return null;
-    }
-
-    private EntityViewManager resolveEntityViewManager(BeanManager beanManager, EntityViewManagerConfig config) {
-        Bean<?> entityViewManagerResolverBean = beanManager.resolve(beanManager.getBeans(config.entityViewManagerResolver()));
-        EntityViewManagerResolver resolver = (EntityViewManagerResolver) beanManager.getReference(entityViewManagerResolverBean, EntityViewManagerResolver.class, beanManager.createCreationalContext(entityViewManagerResolverBean));
-        return resolver.resolveEntityViewManager();
-    }
-
-    private <X> boolean isRepository(AnnotatedType<X> annotatedType) {
-        return (annotatedType.isAnnotationPresent(Repository.class) ||
-                annotatedType.getJavaClass().isAnnotationPresent(Repository.class)) &&
-                !InvocationHandler.class.isAssignableFrom(annotatedType.getJavaClass());
-    }
-
-    private <X> boolean isVetoed(AnnotatedType<X> annotated) {
-        Class<X> javaClass = annotated.getJavaClass();
-        return javaClass.equals(AbstractEntityRepository.class) ||
-                javaClass.equals(AbstractFullEntityRepository.class);
-    }
-
-    public RepositoryComponents getComponents() {
-        RepositoryComponents result = new RepositoryComponents();
-        if (components.getRepositories().isEmpty() && !staticComponents.getRepositories().isEmpty()) {
-            result.addAll(staticComponents.getRepositories());
-        }
-
-        if (!components.getRepositories().isEmpty()) {
-            result.addAll(components.getRepositories());
-        }
-
-        return result;
-    }
-
-    public EntityViewRepositoryComponents getEntityViewRepositoryComponents() {
-        EntityViewRepositoryComponents result = new EntityViewRepositoryComponents();
-        if (entityViewRepositoryComponents.getRepositories().isEmpty() && !staticEntityViewRepositoryComponents.getRepositories().isEmpty()) {
-            result.addAll(staticEntityViewRepositoryComponents.getRepositories());
-        }
-
-        if (!entityViewRepositoryComponents.getRepositories().isEmpty()) {
-            result.addAll(entityViewRepositoryComponents.getRepositories());
-        }
-
-        return result;
-    }
-
-    protected void cleanup(@Observes BeforeShutdown beforeShutdown) {
-        //we can reset it in any case,
-        //because every application produced a copy as application-scoped bean (see RepositoryComponentsFactory)
-        staticComponents.getRepositories().clear();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
deleted file mode 100644
index 2b46b32dc3..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.param.ExtendedParameters;
-import org.apache.deltaspike.data.api.Query;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.QueryInvocation;
-import org.apache.deltaspike.data.impl.util.jpa.QueryStringExtractorFactory;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.util.List;
-
-import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.AnnotatedQueryBuilder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@QueryInvocation(MethodType.ANNOTATED)
-@ApplicationScoped
-public class EntityViewAnnotatedQueryBuilder extends EntityViewQueryBuilder {
-
-    private final QueryStringExtractorFactory factory = new QueryStringExtractorFactory();
-
-    @Override
-    public Object execute(EntityViewCdiQueryInvocationContext context) {
-        Method method = context.getMethod();
-        Query query = method.getAnnotation(Query.class);
-        javax.persistence.Query jpaQuery = createJpaQuery(query, context);
-        return context.executeQuery(jpaQuery);
-    }
-
-    private javax.persistence.Query createJpaQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-        EntityManager entityManager = context.getEntityManager();
-        ExtendedParameters params = context.getParams();
-        javax.persistence.Query result = null;
-        if (isNotEmpty(query.named())) {
-            if (context.hasQueryStringPostProcessors()) {
-                javax.persistence.Query namedQuery = entityManager.createNamedQuery(query.named());
-                String named = factory.extract(namedQuery);
-                String jpqlQuery = context.applyQueryStringPostProcessors(named);
-                result = params.applyTo(entityManager.createQuery(jpqlQuery));
-            } else {
-                result = params.applyTo(entityManager.createNamedQuery(query.named()));
-            }
-        } else if (query.isNative()) {
-            String jpqlQuery = context.applyQueryStringPostProcessors(query.value());
-            Class<?> resultType = getQueryResultType(context.getMethod());
-            if (isEntityType(resultType)) {
-                result = params.applyTo(entityManager.createNativeQuery(jpqlQuery, resultType));
-            } else {
-                result = params.applyTo(entityManager.createNativeQuery(jpqlQuery));
-            }
-        } else {
-            String jpqlQuery = context.applyQueryStringPostProcessors(query.value());
-            context.setQueryString(jpqlQuery);
-            result = params.applyTo(entityManager.createQuery(jpqlQuery));
-        }
-        return context.applyRestrictions(result);
-    }
-
-    private boolean isEntityType(Class<?> cls) {
-        return cls.getAnnotation(Entity.class) != null;
-    }
-
-    private Class<?> getQueryResultType(Method m) {
-        Class<?> rt = m.getReturnType();
-        if (rt.isAssignableFrom(List.class) && rt != Object.class) {
-            ParameterizedType pt = (ParameterizedType) m.getGenericReturnType();
-            return (Class<?>) pt.getActualTypeArguments()[0];
-        }
-        return rt;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
deleted file mode 100644
index b4b2fdd6e3..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.data.api.QueryResult;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.QueryInvocationLiteral;
-
-import javax.enterprise.context.ApplicationScoped;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.deltaspike.data.impl.meta.MethodType.ANNOTATED;
-import static org.apache.deltaspike.data.impl.meta.MethodType.DELEGATE;
-import static org.apache.deltaspike.data.impl.meta.MethodType.PARSE;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilderFactory} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ApplicationScoped
-public class EntityViewAwareQueryBuilderFactory {
-
-    private static final Map<MethodType, QueryInvocationLiteral> LITERALS =
-        new HashMap<MethodType, QueryInvocationLiteral>() {
-            private static final long serialVersionUID = 1L;
-
-            {
-                put(ANNOTATED, new QueryInvocationLiteral(ANNOTATED));
-                put(DELEGATE, new QueryInvocationLiteral(DELEGATE));
-                put(PARSE, new QueryInvocationLiteral(PARSE));
-            }
-        };
-
-    public EntityViewQueryBuilder build(EntityViewRepositoryMethod method, EntityViewCdiQueryInvocationContext context) {
-        EntityViewQueryBuilder builder = BeanProvider.getContextualReference(EntityViewQueryBuilder.class, LITERALS.get(method.getMethodType()));
-        if (method.returns(QueryResult.class)) {
-            return new WrappedEntityViewQueryBuilder(builder);
-        }
-        return builder;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
deleted file mode 100644
index b8ad407e72..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewDelegateQueryHandler;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.core.util.OptionalUtil;
-import org.apache.deltaspike.core.util.StreamUtil;
-import org.apache.deltaspike.data.api.QueryInvocationException;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.QueryInvocation;
-import org.apache.deltaspike.data.impl.util.bean.BeanDestroyable;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.PersistenceException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.DelegateQueryBuilder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@QueryInvocation(MethodType.DELEGATE)
-@ApplicationScoped
-public class EntityViewDelegateQueryBuilder extends EntityViewQueryBuilder {
-    @Inject
-    private BeanManager beanManager;
-
-    private final Map<Method, Bean<EntityViewDelegateQueryHandler>> lookupCache = new ConcurrentHashMap<>();
-
-    @Override
-    public Object execute(EntityViewCdiQueryInvocationContext context) {
-        try {
-            EntityViewDelegateQueryHandler delegate = lookup(context);
-            if (delegate != null) {
-                Object result = invoke(delegate, context);
-                if (result instanceof Collection && StreamUtil.isStreamReturned(context.getMethod())) {
-                    return StreamUtil.wrap(result);
-                } else if (OptionalUtil.isOptionalReturned(context.getMethod())) {
-                    return OptionalUtil.wrap(result);
-                } else {
-                    return result;
-                }
-            }
-        } catch (PersistenceException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new QueryInvocationException(e, context);
-        }
-        throw new QueryInvocationException("No DelegateQueryHandler found", context);
-    }
-
-    private EntityViewDelegateQueryHandler lookup(EntityViewCdiQueryInvocationContext context) {
-        Bean<EntityViewDelegateQueryHandler> selectedBean = lookupCache.get(context.getMethod());
-
-        if (selectedBean == null) {
-            Set<Bean<EntityViewDelegateQueryHandler>> beans = BeanProvider
-                    .getBeanDefinitions(EntityViewDelegateQueryHandler.class, true, true);
-            for (Bean<EntityViewDelegateQueryHandler> bean : beans) {
-                if (ClassUtils.containsPossiblyGenericMethod(bean.getBeanClass(), context.getMethod())) {
-                    selectedBean = bean;
-                }
-            }
-
-            if (selectedBean != null) {
-                lookupCache.put(context.getMethod(), selectedBean);
-            }
-        }
-
-
-        if (selectedBean != null) {
-            CreationalContext<EntityViewDelegateQueryHandler> cc = beanManager.createCreationalContext(selectedBean);
-            EntityViewDelegateQueryHandler instance = (EntityViewDelegateQueryHandler) beanManager.getReference(
-                    selectedBean, EntityViewDelegateQueryHandler.class, cc);
-
-            if (selectedBean.getScope().equals(Dependent.class)) {
-                context.addDestroyable(new BeanDestroyable<EntityViewDelegateQueryHandler>(selectedBean, instance, cc));
-            }
-
-            return instance;
-        }
-        return null;
-    }
-
-    private Object invoke(EntityViewDelegateQueryHandler delegate, EntityViewCdiQueryInvocationContext context) {
-        try {
-            Method extract = ClassUtils.extractPossiblyGenericMethod(delegate.getClass(), context.getMethod());
-            return extract.invoke(delegate, context.getMethodParameters());
-        } catch (InvocationTargetException e) {
-            if (e.getCause() != null && e.getCause() instanceof PersistenceException) {
-                throw (PersistenceException) e.getCause();
-            }
-            throw new QueryInvocationException(e, context);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
deleted file mode 100644
index 768c9a32bc..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.FullQueryBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteriaQuery;
-import com.blazebit.persistence.criteria.BlazeCriteria;
-import com.blazebit.persistence.deltaspike.data.Pageable;
-import com.blazebit.persistence.deltaspike.data.Specification;
-import com.blazebit.persistence.deltaspike.data.base.builder.QueryBuilderUtils;
-import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.param.ExtendedParameters;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.QueryInvocation;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.persistence.Query;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.MethodQueryBuilder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@QueryInvocation(MethodType.PARSE)
-@ApplicationScoped
-public class EntityViewMethodQueryBuilder extends EntityViewQueryBuilder {
-
-    @Override
-    public Object execute(EntityViewCdiQueryInvocationContext context) {
-        Query jpaQuery = createJpaQuery(context);
-        return context.executeQuery(jpaQuery);
-    }
-
-    private <V> Query createJpaQuery(EntityViewCdiQueryInvocationContext context) {
-        ExtendedParameters params = context.getParams();
-        EntityViewQueryRoot root = context.getRepositoryMethod().getEntityViewQueryRoot();
-        Pageable pageable = params.getPageable();
-        CriteriaBuilder<?> cb;
-
-        Specification<?> specification = params.getSpecification();
-        if (specification == null) {
-            cb = context.getCriteriaBuilderFactory().create(context.getEntityManager(), context.getEntityClass());
-            root.apply(cb);
-        } else {
-            BlazeCriteriaBuilder blazeCriteriaBuilder = BlazeCriteria.get(context.getCriteriaBuilderFactory());
-            BlazeCriteriaQuery<?> query = blazeCriteriaBuilder.createQuery(context.getEntityClass());
-            Root queryRoot = query.from(context.getEntityClass());
-            root.apply(queryRoot, query, blazeCriteriaBuilder);
-            Predicate predicate = specification.toPredicate(queryRoot, query, blazeCriteriaBuilder);
-            if (predicate != null) {
-                if (query.getRestriction() == null) {
-                    query.where(predicate);
-                } else {
-                    query.where(query.getRestriction(), predicate);
-                }
-            }
-            cb = query.createCriteriaBuilder(context.getEntityManager());
-        }
-
-        Class<V> entityViewClass = (Class<V>) context.getEntityViewClass();
-        boolean keysetExtraction = false; // TODO: depending on return type we might need to do keyset extraction
-        FullQueryBuilder<? ,?> fullCb = QueryBuilderUtils.getFullQueryBuilder(cb, pageable, context.getEntityViewManager(), entityViewClass, keysetExtraction);
-
-        fullCb = context.applyCriteriaBuilderPostProcessors(fullCb);
-        Query q = params.applyTo(context.createQuery(fullCb));
-        return context.applyRestrictions(q);
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
deleted file mode 100644
index 90f4d37bb0..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import org.apache.deltaspike.data.api.QueryResult;
-import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
-
-import javax.persistence.Query;
-import java.lang.reflect.Method;
-import java.util.List;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public abstract class EntityViewQueryBuilder {
-
-    @SuppressWarnings("unchecked")
-    public Object executeQuery(EntityViewCdiQueryInvocationContext context) {
-        Object result = execute(context);
-        if (!isUnmappableResult(result) && context.hasQueryInOutMapper()) {
-            QueryInOutMapper<Object> mapper = (QueryInOutMapper<Object>)
-                    context.getQueryInOutMapper();
-            if (result instanceof List) {
-                return mapper.mapResultList((List<Object>) result);
-            }
-            return mapper.mapResult(result);
-        }
-        return result;
-    }
-
-    protected abstract Object execute(EntityViewCdiQueryInvocationContext ctx);
-
-    protected boolean returnsList(Method method) {
-        return method.getReturnType().isAssignableFrom(List.class);
-    }
-
-    private boolean isUnmappableResult(Object result) {
-        return result instanceof QueryResult ||
-                result instanceof Query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
deleted file mode 100644
index dc1bb7dd21..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilderContext.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-import com.blazebit.persistence.deltaspike.data.base.builder.part.OrderByQueryAttribute;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilderContext} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewQueryBuilderContext {
-
-    private final StringBuilder whereExpressionBuilder = new StringBuilder();
-    private final List<OrderByQueryAttribute> orderByAttributes = new ArrayList<>();
-    private int counter = 1;
-
-    public EntityViewQueryBuilderContext reset() {
-        counter = 1;
-        return this;
-    }
-
-    public int increment() {
-        return counter++;
-    }
-
-    public StringBuilder getWhereExpressionBuilder() {
-        return whereExpressionBuilder;
-    }
-
-    public List<OrderByQueryAttribute> getOrderByAttributes() {
-        return orderByAttributes;
-    }
-}
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
deleted file mode 100644
index 7b91c37aea..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder;
-
-
-import com.blazebit.persistence.deltaspike.data.impl.builder.result.EntityViewDefaultQueryResult;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.WrappedQueryBuilder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class WrappedEntityViewQueryBuilder extends EntityViewQueryBuilder {
-
-    private final EntityViewQueryBuilder delegate;
-
-    public WrappedEntityViewQueryBuilder(EntityViewQueryBuilder delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Object execute(EntityViewCdiQueryInvocationContext ctx) {
-        return new EntityViewDefaultQueryResult(delegate, ctx);
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
deleted file mode 100644
index fe6fa16004..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.part;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.deltaspike.data.Specification;
-import com.blazebit.persistence.deltaspike.data.base.builder.EntityViewQueryBuilderContext;
-import com.blazebit.persistence.deltaspike.data.base.builder.part.CompoundOperatorSpecification;
-import com.blazebit.persistence.deltaspike.data.base.builder.part.EntityViewOrQueryPart;
-import com.blazebit.persistence.deltaspike.data.base.builder.part.EntityViewOrderByQueryPart;
-import com.blazebit.persistence.deltaspike.data.base.builder.part.EntityViewQueryPart;
-import com.blazebit.persistence.deltaspike.data.base.builder.part.OrderByQueryAttribute;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent;
-import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
-import org.apache.deltaspike.data.impl.meta.MethodPrefix;
-
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.deltaspike.data.impl.util.QueryUtils.splitByKeyword;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.part.QueryRoot} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewQueryRoot extends EntityViewQueryPart {
-    private final Class<?> entityClass;
-    private final MethodPrefix methodPrefix;
-    private final String whereExpression;
-    private final List<OrderByQueryAttribute> orderByAttributes;
-    private final Specification<?> specification;
-
-    protected EntityViewQueryRoot(String method, EntityViewRepositoryComponent repo, MethodPrefix methodPrefix) {
-        this.entityClass = repo.getEntityClass();
-        this.methodPrefix = methodPrefix;
-        build(method, method, repo.getRepositoryClass(), repo.getEntityClass());
-        EntityViewQueryBuilderContext ctx = new EntityViewQueryBuilderContext();
-        buildQuery(ctx);
-        StringBuilder whereExpressionBuilder = ctx.getWhereExpressionBuilder();
-        this.whereExpression = whereExpressionBuilder.length() > 0 ? whereExpressionBuilder.toString() : null;
-        this.orderByAttributes = ctx.getOrderByAttributes();
-        this.specification = buildSpecification(ctx.reset());
-    }
-
-    public static EntityViewQueryRoot create(String method, EntityViewRepositoryComponent repo, MethodPrefix prefix) {
-        return new EntityViewQueryRoot(method, repo, prefix);
-    }
-
-    @Override
-    public EntityViewQueryPart build(String queryPart, String method, Class<?> repositoryClass, Class<?> entityClass) {
-        String[] orderByParts = splitByKeyword(queryPart, "OrderBy");
-        if (hasQueryConditions(orderByParts)) {
-            String[] orParts = splitByKeyword(removePrefix(orderByParts[0]), "Or");
-            boolean first = true;
-            for (String or : orParts) {
-                EntityViewOrQueryPart orPart = new EntityViewOrQueryPart(first);
-                first = false;
-                children.add(orPart.build(or, method, repositoryClass, entityClass));
-            }
-        }
-        if (orderByParts.length > 1) {
-            EntityViewOrderByQueryPart orderByPart = new EntityViewOrderByQueryPart();
-            children.add(orderByPart.build(orderByParts[1], method, repositoryClass, entityClass));
-        }
-        if (children.isEmpty()) {
-            throw new MethodExpressionException(repositoryClass, method);
-        }
-        return this;
-    }
-
-    @Override
-    protected EntityViewQueryPart buildQuery(EntityViewQueryBuilderContext ctx) {
-        buildQueryForChildren(ctx);
-        return this;
-    }
-
-    @Override
-    protected Specification<?> buildSpecification(EntityViewQueryBuilderContext ctx) {
-        return CompoundOperatorSpecification.and(buildSpecificationsForChildren(ctx));
-    }
-
-    public void apply(CriteriaBuilder<?> cb) {
-        if (methodPrefix.isDelete()) {
-            throw new UnsupportedOperationException("Delete queries not supported in entity view repositories");
-        } else {
-            cb.from(entityClass);
-        }
-        if (whereExpression != null) {
-            cb.setWhereExpression(whereExpression);
-        }
-        for (OrderByQueryAttribute orderByAttribute : orderByAttributes) {
-            orderByAttribute.buildQuery(cb);
-        }
-    }
-
-    public void apply(Root<?> root, CriteriaQuery<?> query, javax.persistence.criteria.CriteriaBuilder cb) {
-        if (specification != null) {
-            query.where(specification.toPredicate((Root) root, query, cb));
-        }
-        List<Order> orders = new ArrayList<>(orderByAttributes.size());
-        for (OrderByQueryAttribute orderByAttribute : orderByAttributes) {
-            orders.add(orderByAttribute.buildOrder(root, cb));
-        }
-        query.orderBy(orders);
-    }
-
-    private boolean hasQueryConditions(String[] orderByParts) {
-        String orderByPart = orderByParts[0];
-        String prefix = methodPrefix.getPrefix();
-        return !prefix.equals(orderByPart) && !orderByPart.matches(prefix);
-    }
-
-    private String removePrefix(String queryPart) {
-        return methodPrefix.removePrefix(queryPart);
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
deleted file mode 100644
index 0f617f0f66..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.param.ExtendedParameters;
-import org.apache.deltaspike.data.impl.util.jpa.QueryStringExtractorFactory;
-
-import javax.persistence.Query;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
-import static org.apache.deltaspike.data.impl.util.QueryUtils.nullSafeValue;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.CountQueryPostProcessor} but was modified to
- * work with entity views.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CountQueryPostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private static final Logger LOG = Logger.getLogger(org.apache.deltaspike.data.impl.builder.postprocessor.CountQueryPostProcessor.class.getName());
-
-    private final QueryStringExtractorFactory factory = new QueryStringExtractorFactory();
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        String queryString = getQueryString(context, query);
-        CountQueryPostProcessor.QueryExtraction extract = new CountQueryPostProcessor.QueryExtraction(queryString);
-        String count = extract.rewriteToCount();
-        LOG.log(Level.FINER, "Rewrote query {0} to {1}", new Object[]{queryString, count});
-        Query result = context.getEntityManager().createQuery(count);
-        ExtendedParameters params = context.getParams();
-        params.applyTo(result);
-        return result;
-    }
-
-    private String getQueryString(EntityViewCdiQueryInvocationContext context, Query query) {
-        if (isNotEmpty(context.getQueryString())) {
-            return context.getQueryString();
-        }
-        return factory.extract(query);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class QueryExtraction {
-
-        private String select;
-        private String from;
-        private String where;
-
-        private String entityName;
-        private final String query;
-
-        public QueryExtraction(String query) {
-            this.query = query;
-        }
-
-        public String rewriteToCount() {
-            splitQuery();
-            extractEntityName();
-            return rewrite();
-        }
-
-        private String rewrite() {
-            return new StringBuilder()
-                    .append("select count(")
-                    .append(nullSafeValue(select, entityName))
-                    .append(") ")
-                    .append(from)
-                    .append(nullSafeValue(where))
-                    .toString();
-        }
-
-        private void extractEntityName() {
-            String[] split = from.split(" ");
-            if (split.length > 1) {
-                entityName = split[split.length - 1];
-            } else {
-                entityName = "*";
-            }
-        }
-
-        private void splitQuery() {
-            String lower = query.toLowerCase();
-            int selectIndex = lower.indexOf("select");
-            int fromIndex = lower.indexOf("from");
-            int whereIndex = lower.indexOf("where");
-            int orderByIndex = lower.indexOf("order by");
-            if (selectIndex >= 0) {
-                select = query.substring("select".length(), fromIndex);
-            }
-            if (whereIndex >= 0) {
-                from = query.substring(fromIndex, whereIndex);
-                where = query.substring(whereIndex);
-                if (orderByIndex > 0) {
-                    where = where.substring(0, orderByIndex - whereIndex);
-                }
-            } else {
-                from = query.substring(fromIndex);
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java
deleted file mode 100644
index cf54024461..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.FirstResultPostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class FirstResultPostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private final int first;
-
-    public FirstResultPostProcessor(int first) {
-        this.first = first;
-    }
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        query.setFirstResult(first);
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
deleted file mode 100644
index 53f4f7db76..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-
-import javax.persistence.FlushModeType;
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.FlushModePostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class FlushModePostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private final FlushModeType flushMode;
-
-    public FlushModePostProcessor(FlushModeType flushMode) {
-        this.flushMode = flushMode;
-    }
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        query.setFlushMode(flushMode);
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
deleted file mode 100644
index 1d4cf955bc..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.HintPostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class HintPostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private final String hintName;
-    private final Object hintValue;
-
-    public HintPostProcessor(String hintName, Object hintValue) {
-        this.hintName = hintName;
-        this.hintValue = hintValue;
-    }
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        query.setHint(hintName, hintValue);
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
deleted file mode 100644
index 110688687e..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.LockModePostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class LockModePostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private final LockModeType lockMode;
-
-    public LockModePostProcessor(LockModeType lockMode) {
-        this.lockMode = lockMode;
-    }
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        query.setLockMode(lockMode);
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java
deleted file mode 100644
index dd86a75aee..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewJpaQueryPostProcessor;
-
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.postprocessor.MaxResultPostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class MaxResultPostProcessor implements EntityViewJpaQueryPostProcessor {
-
-    private final int max;
-
-    public MaxResultPostProcessor(int max) {
-        this.max = max;
-    }
-
-    @Override
-    public Query postProcess(EntityViewCdiQueryInvocationContext context, Query query) {
-        query.setMaxResults(max);
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
deleted file mode 100644
index 3789e5a31b..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.result;
-
-import com.blazebit.persistence.PaginatedTypedQuery;
-import com.blazebit.persistence.deltaspike.data.ExtendedQueryResult;
-import com.blazebit.persistence.deltaspike.data.base.builder.postprocessor.CountCriteriaBuilderQueryCreator;
-import com.blazebit.persistence.deltaspike.data.base.builder.postprocessor.OrderByCriteriaBuilderPostProcessor;
-import com.blazebit.persistence.deltaspike.data.base.builder.postprocessor.PaginationCriteriaBuilderPostProcessor;
-import com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.CountQueryPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.FirstResultPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.FlushModePostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.HintPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.LockModePostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.builder.postprocessor.MaxResultPostProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import org.apache.deltaspike.data.impl.builder.OrderDirection;
-import org.apache.deltaspike.data.impl.builder.postprocessor.OrderByQueryStringPostProcessor;
-import org.apache.deltaspike.data.impl.handler.QueryStringPostProcessor;
-
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.metamodel.SingularAttribute;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.result.DefaultQueryResult} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewDefaultQueryResult<T> implements ExtendedQueryResult<T> {
-
-    private final EntityViewQueryBuilder builder;
-    private final EntityViewCdiQueryInvocationContext context;
-
-    private PaginatedTypedQuery<T> lastPaginatedQuery;
-    private boolean withCount = false;
-    private int page = 0;
-    private int pageSize = 10;
-    private int firstResult = 0;
-    private int maxResults = -1;
-
-    public EntityViewDefaultQueryResult(EntityViewQueryBuilder builder, EntityViewCdiQueryInvocationContext context) {
-        this.builder = builder;
-        this.context = context;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> withCountQuery(boolean withCountQuery) {
-        this.withCount = withCountQuery;
-        return this;
-    }
-
-    @Override
-    public <X> ExtendedQueryResult<T> orderAsc(SingularAttribute<T, X> attribute) {
-        return orderAsc(attribute, true);
-    }
-
-    @Override
-    public <X> ExtendedQueryResult<T> orderAsc(SingularAttribute<T, X> attribute, boolean appendEntityName) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addQueryStringPostProcessor(new OrderByQueryStringPostProcessor(attribute, OrderDirection.ASC, appendEntityName));
-        } else {
-            context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.ASC));
-        }
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> orderAsc(String attribute) {
-        return orderAsc(attribute, true);
-    }
-
-    @Override
-    public ExtendedQueryResult<T> orderAsc(String attribute, boolean appendEntityName) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addQueryStringPostProcessor(new OrderByQueryStringPostProcessor(attribute, OrderDirection.ASC, appendEntityName));
-        } else {
-            context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.ASC));
-        }
-        return this;
-    }
-
-    @Override
-    public <X> ExtendedQueryResult<T> orderDesc(SingularAttribute<T, X> attribute) {
-        return orderDesc(attribute, true);
-    }
-
-    @Override
-    public <X> ExtendedQueryResult<T> orderDesc(SingularAttribute<T, X> attribute, boolean appendEntityName) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addQueryStringPostProcessor(new OrderByQueryStringPostProcessor(attribute, OrderDirection.ASC, appendEntityName));
-        } else {
-            context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.DESC));
-        }
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> orderDesc(String attribute) {
-        return orderDesc(attribute, true);
-    }
-
-    @Override
-    public ExtendedQueryResult<T> orderDesc(String attribute, boolean appendEntityName) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addQueryStringPostProcessor(new OrderByQueryStringPostProcessor(attribute, OrderDirection.ASC, appendEntityName));
-        } else {
-            context.addCriteriaBuilderPostProcessor(new OrderByCriteriaBuilderPostProcessor(attribute, OrderDirection.DESC));
-        }
-        return this;
-    }
-
-    @Override
-    public <X> ExtendedQueryResult<T> changeOrder(final SingularAttribute<T, X> attribute) {
-        changeOrder(new EntityViewDefaultQueryResult.ChangeOrder() {
-            @Override
-            public boolean matches(OrderByQueryStringPostProcessor orderBy) {
-                return orderBy.matches(attribute);
-            }
-
-            @Override
-            public boolean matches(OrderByCriteriaBuilderPostProcessor orderBy) {
-                return orderBy.matches(attribute);
-            }
-
-            @Override
-            public void addDefault() {
-                orderAsc(attribute);
-            }
-        });
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> changeOrder(final String attribute) {
-        changeOrder(new EntityViewDefaultQueryResult.ChangeOrder() {
-            @Override
-            public boolean matches(OrderByQueryStringPostProcessor orderBy) {
-                return orderBy.matches(attribute);
-            }
-
-            @Override
-            public boolean matches(OrderByCriteriaBuilderPostProcessor orderBy) {
-                return orderBy.matches(attribute);
-            }
-
-            @Override
-            public void addDefault() {
-                orderAsc(attribute);
-            }
-        });
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> clearOrder() {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            for (Iterator<QueryStringPostProcessor> it = context.getQueryStringPostProcessors().iterator(); it.hasNext(); ) {
-                if (it.next() instanceof OrderByQueryStringPostProcessor) {
-                    it.remove();
-                }
-            }
-        } else {
-            for (Iterator<CriteriaBuilderPostProcessor> it = context.getCriteriaBuilderPostProcessors().iterator(); it.hasNext(); ) {
-                if (it.next() instanceof OrderByCriteriaBuilderPostProcessor) {
-                    it.remove();
-                }
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> maxResults(int max) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addJpaQueryPostProcessor(new MaxResultPostProcessor(max));
-        } else {
-            maxResults = max;
-            pageSize = max;
-        }
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> firstResult(int first) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            context.addJpaQueryPostProcessor(new FirstResultPostProcessor(first));
-        } else {
-            firstResult = first;
-        }
-        return this;
-    }
-
-    private boolean updatePaginationPostProcessor() {
-        clearPagination();
-        if (!context.getRepositoryMethod().isQuery()) {
-            if (isFirstResultSet() || isMaxResultsSet()) {
-                context.addCriteriaBuilderPostProcessor(new PaginationCriteriaBuilderPostProcessor(firstResult, maxResults < 0 ? Integer.MAX_VALUE : maxResults));
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void clearPagination() {
-        if (!context.getRepositoryMethod().isQuery()) {
-            Iterator<CriteriaBuilderPostProcessor> iterator = context.getCriteriaBuilderPostProcessors().iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next() instanceof PaginationCriteriaBuilderPostProcessor) {
-                    iterator.remove();
-                }
-            }
-        }
-    }
-
-    private boolean isFirstResultSet() {
-        return firstResult > 0;
-    }
-
-    private boolean isMaxResultsSet() {
-        return maxResults >= 0;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> lockMode(LockModeType lockMode) {
-        lastPaginatedQuery = null;
-        context.addJpaQueryPostProcessor(new LockModePostProcessor(lockMode));
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> flushMode(FlushModeType flushMode) {
-        lastPaginatedQuery = null;
-        context.addJpaQueryPostProcessor(new FlushModePostProcessor(flushMode));
-        return this;
-    }
-
-    @Override
-    public ExtendedQueryResult<T> hint(String hint, Object value) {
-        lastPaginatedQuery = null;
-        context.addJpaQueryPostProcessor(new HintPostProcessor(hint, value));
-        return this;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<T> getResultList() {
-        return getResultList(withCount);
-    }
-
-    @Override
-    public List<T> getPageResultList() {
-        return getResultList(false);
-    }
-
-    public List<T> getResultList(boolean withCountQuery) {
-        if (lastPaginatedQuery != null) {
-            if (withCountQuery) {
-                return lastPaginatedQuery.getResultList();
-            } else {
-                return lastPaginatedQuery.getPageResultList();
-            }
-        }
-        updatePaginationPostProcessor();
-        Query query = (Query) builder.executeQuery(context);
-        if (query instanceof PaginatedTypedQuery<?>) {
-            lastPaginatedQuery = (PaginatedTypedQuery<T>) query;
-            if (withCountQuery) {
-                return lastPaginatedQuery.getResultList();
-            } else {
-                return lastPaginatedQuery.getPageResultList();
-            }
-        }
-
-        return query.getResultList();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public T getSingleResult() {
-        updatePaginationPostProcessor();
-        return (T) ((Query) builder.executeQuery(context)).getSingleResult();
-    }
-
-    @Override
-    public T getOptionalResult() {
-        try {
-            return getSingleResult();
-        } catch (NoResultException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public T getAnyResult() {
-        List<T> queryResult = getResultList();
-        return !queryResult.isEmpty() ? queryResult.get(0) : null;
-    }
-
-    @Override
-    public long count() {
-        if (context.getRepositoryMethod().isQuery()) {
-            CountQueryPostProcessor counter = new CountQueryPostProcessor();
-            context.addJpaQueryPostProcessor(counter);
-            try {
-                Long result = (Long) ((Query) builder.executeQuery(context)).getSingleResult();
-                return result;
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            } finally {
-                context.removeJpaQueryPostProcessor(counter);
-            }
-        } else {
-            if (lastPaginatedQuery != null) {
-                return lastPaginatedQuery.getTotalCount();
-            }
-            if (updatePaginationPostProcessor()) {
-                Query query = (Query) builder.executeQuery(context);
-                if (query instanceof PaginatedTypedQuery<?>) {
-                    lastPaginatedQuery = (PaginatedTypedQuery<T>) query;
-                    return lastPaginatedQuery.getTotalCount();
-                }
-            }
-
-            context.setQueryCreator(new CountCriteriaBuilderQueryCreator());
-            try {
-                Long result = (Long) ((Query) builder.executeQuery(context)).getSingleResult();
-                return result;
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            } finally {
-                context.setQueryCreator(null);
-            }
-        }
-    }
-
-    @Override
-    public ExtendedQueryResult<T> withPageSize(int pageSize) {
-        return maxResults(pageSize);
-    }
-
-    @Override
-    public ExtendedQueryResult<T> toPage(int page) {
-        this.page = page;
-        return firstResult(pageSize * page);
-    }
-
-    @Override
-    public ExtendedQueryResult<T> nextPage() {
-        page = page + 1;
-        return firstResult(pageSize * page);
-    }
-
-    @Override
-    public ExtendedQueryResult<T> previousPage() {
-        page = page > 0 ? page - 1 : page;
-        return firstResult(pageSize * page);
-    }
-
-    @Override
-    public int countPages() {
-        return (int) Math.ceil((double) count() / pageSize);
-    }
-
-    @Override
-    public int currentPage() {
-        return page;
-    }
-
-    @Override
-    public int pageSize() {
-        return pageSize;
-    }
-
-    private <X> ExtendedQueryResult<T> changeOrder(EntityViewDefaultQueryResult.ChangeOrder changeOrder) {
-        lastPaginatedQuery = null;
-        if (context.getRepositoryMethod().isQuery()) {
-            for (QueryStringPostProcessor processor : context.getQueryStringPostProcessors()) {
-                if (processor instanceof OrderByQueryStringPostProcessor) {
-                    OrderByQueryStringPostProcessor orderBy = (OrderByQueryStringPostProcessor) processor;
-                    if (changeOrder.matches(orderBy)) {
-                        orderBy.changeDirection();
-                        return this;
-                    }
-                }
-            }
-        } else {
-            for (CriteriaBuilderPostProcessor processor : context.getCriteriaBuilderPostProcessors()) {
-                if (processor instanceof OrderByCriteriaBuilderPostProcessor) {
-                    OrderByCriteriaBuilderPostProcessor orderBy = (OrderByCriteriaBuilderPostProcessor) processor;
-                    if (changeOrder.matches(orderBy)) {
-                        orderBy.changeDirection();
-                        return this;
-                    }
-                }
-            }
-        }
-        changeOrder.addDefault();
-        return this;
-    }
-
-    /**
-     * @author Moritz Becker
-     * @since 1.2.0
-     */
-    private abstract static class ChangeOrder {
-
-        public abstract boolean matches(OrderByQueryStringPostProcessor orderBy);
-
-        public abstract boolean matches(OrderByCriteriaBuilderPostProcessor orderBy);
-
-        public abstract void addDefault();
-
-    }
-
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java
deleted file mode 100644
index 22bb1f113d..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewQueryProcessor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.builder.result;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.result.QueryProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public interface EntityViewQueryProcessor {
-    Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context);
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
deleted file mode 100644
index 5fb680b4d7..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.deltaspike.data.base.criteria.QueryCriteria;
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewContext;
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewDelegateQueryHandler;
-import org.apache.deltaspike.data.api.criteria.Criteria;
-import org.apache.deltaspike.data.api.criteria.CriteriaSupport;
-import org.apache.deltaspike.data.api.criteria.QuerySelection;
-import org.apache.deltaspike.data.impl.criteria.selection.AttributeQuerySelection;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Abs;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Avg;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Count;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.CountDistinct;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Max;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Min;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Modulo;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Neg;
-import org.apache.deltaspike.data.impl.criteria.selection.numeric.Sum;
-import org.apache.deltaspike.data.impl.criteria.selection.strings.Lower;
-import org.apache.deltaspike.data.impl.criteria.selection.strings.SubstringFrom;
-import org.apache.deltaspike.data.impl.criteria.selection.strings.SubstringFromTo;
-import org.apache.deltaspike.data.impl.criteria.selection.strings.Trim;
-import org.apache.deltaspike.data.impl.criteria.selection.strings.Upper;
-import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentDate;
-import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTime;
-import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTimestamp;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.metamodel.SingularAttribute;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Dependent
-public class CriteriaSupportHandler<E> implements CriteriaSupport<E>, EntityViewDelegateQueryHandler {
-
-    @Inject
-    @EntityViewContext
-    private EntityViewCdiQueryInvocationContext context;
-    @Inject
-    private CriteriaBuilderFactory criteriaBuilderFactory;
-
-    @SuppressWarnings("unchecked")
-    private Class<E> getEntityClass() {
-        return (Class<E>) context.getEntityClass();
-    }
-
-    private EntityManager getEntityManager() {
-        return context.getEntityManager();
-    }
-
-    @Override
-    public Criteria<E, E> criteria() {
-        return new QueryCriteria<E, E>(getEntityClass(), getEntityClass(), getEntityManager(), criteriaBuilderFactory, context.getEntityViewManager());
-    }
-
-    @Override
-    public <T> Criteria<T, T> where(Class<T> clazz) {
-        return new QueryCriteria<T, T>(clazz, clazz, getEntityManager(), criteriaBuilderFactory, context.getEntityViewManager());
-    }
-
-    @Override
-    public <T> Criteria<T, T> where(Class<T> clazz, JoinType joinType) {
-        return new QueryCriteria<T, T>(clazz, clazz, getEntityManager(), joinType, criteriaBuilderFactory, context.getEntityViewManager());
-    }
-
-    // The rest of this class is copied from org.apache.deltaspike.data.impl.handler.CriteriaSupportHandler
-
-    @Override
-    public <X> QuerySelection<E, X> attribute(SingularAttribute<? super E, X> attribute) {
-        return new AttributeQuerySelection<E, X>(attribute);
-    }
-
-    // ----------------------------------------------------------------------------
-    // NUMERIC QUERY SELECTION
-    // ----------------------------------------------------------------------------
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> abs(SingularAttribute<? super E, N> attribute) {
-        return new Abs<E, N>(attribute);
-    }
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> avg(SingularAttribute<? super E, N> attribute) {
-        return new Avg<E, N>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, Long> count(SingularAttribute<? super E, ?> attribute) {
-        return new Count<E>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, Long> countDistinct(SingularAttribute<? super E, ?> attribute) {
-        return new CountDistinct<E>(attribute);
-    }
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> max(SingularAttribute<? super E, N> attribute) {
-        return new Max<E, N>(attribute);
-    }
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> min(SingularAttribute<? super E, N> attribute) {
-        return new Min<E, N>(attribute);
-    }
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> neg(SingularAttribute<? super E, N> attribute) {
-        return new Neg<E, N>(attribute);
-    }
-
-    @Override
-    public <N extends Number> QuerySelection<E, N> sum(SingularAttribute<? super E, N> attribute) {
-        return new Sum<E, N>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, Integer> modulo(SingularAttribute<? super E, Integer> attribute, Integer modulo) {
-        return new Modulo<E>(attribute, modulo);
-    }
-
-    // ----------------------------------------------------------------------------
-    // STRING QUERY SELECTION
-    // ----------------------------------------------------------------------------
-
-    @Override
-    public QuerySelection<E, String> upper(SingularAttribute<? super E, String> attribute) {
-        return new Upper<E>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, String> lower(SingularAttribute<? super E, String> attribute) {
-        return new Lower<E>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, String> substring(SingularAttribute<? super E, String> attribute, int from) {
-        return new SubstringFrom<E>(attribute, from);
-    }
-
-    @Override
-    public QuerySelection<E, String> substring(SingularAttribute<? super E, String> attribute, int from, int length) {
-        return new SubstringFromTo<E>(attribute, from, length);
-    }
-
-    @Override
-    public QuerySelection<E, String> trim(SingularAttribute<? super E, String> attribute) {
-        return new Trim<E>(attribute);
-    }
-
-    @Override
-    public QuerySelection<E, String> trim(CriteriaBuilder.Trimspec trimspec,
-                                          SingularAttribute<? super E, String> attribute) {
-        return new Trim<E>(trimspec, attribute);
-    }
-
-    // ----------------------------------------------------------------------------
-    // TEMPORAL QUERY SELECTION
-    // ----------------------------------------------------------------------------
-
-    @Override
-    public QuerySelection<E, Date> currDate() {
-        return new CurrentDate<E>();
-    }
-
-    @Override
-    public QuerySelection<E, Time> currTime() {
-        return new CurrentTime<E>();
-    }
-
-    @Override
-    public QuerySelection<E, Timestamp> currTStamp() {
-        return new CurrentTimestamp<E>();
-    }
-}
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java
deleted file mode 100644
index d39b54e7c3..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityManagerRefLookup.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent;
-import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.data.impl.handler.EntityManagerRef;
-import org.apache.deltaspike.jpa.spi.entitymanager.ActiveEntityManagerHolder;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import java.util.Set;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.EntityManagerRefLookup} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ApplicationScoped
-public class EntityManagerRefLookup {
-    @Inject
-    private ActiveEntityManagerHolder activeEntityManagerHolder;
-
-    private volatile Boolean globalEntityManagerInitialized;
-    private boolean globalEntityManagerIsNormalScope;
-    private EntityManager globalEntityManager;
-
-    private void lazyInitGlobalEntityManager() {
-        if (this.globalEntityManagerInitialized == null) {
-            initGlobalEntityManager();
-        }
-    }
-
-    private synchronized void initGlobalEntityManager() {
-        // switch into paranoia mode
-        if (this.globalEntityManagerInitialized == null) {
-            this.globalEntityManagerInitialized = true;
-
-            BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-            Set<Bean<?>> beans = beanManager.getBeans(EntityManager.class);
-            Bean<?> bean = beanManager.resolve(beans);
-
-            if (bean == null) {
-                throw new IllegalStateException("Could not find EntityManager with default qualifier.");
-            }
-
-            globalEntityManagerIsNormalScope = beanManager.isNormalScope(bean.getScope());
-            if (globalEntityManagerIsNormalScope) {
-                globalEntityManager = (EntityManager) beanManager.getReference(bean,
-                        EntityManager.class,
-                        beanManager.createCreationalContext(bean));
-            }
-        }
-    }
-
-    public EntityManagerRef lookupReference(final EntityViewRepositoryComponent repository) {
-        EntityManagerRef ref = new EntityManagerRef();
-
-        if (repository.hasEntityManagerResolver()) {
-            ref.setEntityManagerResolverClass(
-                    repository.getEntityManagerResolverClass());
-
-            if (repository.isEntityManagerResolverIsNormalScope()) {
-                ref.setEntityManagerResolver(
-                        BeanProvider.getContextualReference(ref.getEntityManagerResolverClass()));
-            } else {
-                ref.setEntityManagerResolverDependentProvider(
-                        BeanProvider.getDependent(ref.getEntityManagerResolverClass()));
-
-                ref.setEntityManagerResolver(
-                        ref.getEntityManagerResolverDependentProvider().get());
-            }
-
-            ref.setEntityManager(
-                    ref.getEntityManagerResolver().resolveEntityManager());
-        } else {
-            if (activeEntityManagerHolder.isSet()) {
-                ref.setEntityManager(
-                        activeEntityManagerHolder.get());
-
-                // TODO should we really not apply the FlushMode on the active EntityManager?
-                return ref;
-            } else {
-                lazyInitGlobalEntityManager();
-                if (globalEntityManagerIsNormalScope) {
-                    ref.setEntityManager(globalEntityManager);
-                } else {
-                    ref.setEntityManagerDependentProvider(
-                            BeanProvider.getDependent(EntityManager.class));
-                    ref.setEntityManager(
-                            ref.getEntityManagerDependentProvider().get());
-                }
-            }
-        }
-
-        if (repository.hasEntityManagerFlushMode()) {
-            ref.getEntityManager().setFlushMode(repository.getEntityManagerFlushMode());
-        }
-
-        return ref;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
deleted file mode 100644
index 12413b93f2..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewManagerRef;
-import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewAwareQueryBuilderFactory;
-import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponents;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod;
-import org.apache.deltaspike.core.api.lifecycle.Initialized;
-import org.apache.deltaspike.core.util.ProxyUtils;
-import org.apache.deltaspike.data.api.QueryInvocationException;
-import org.apache.deltaspike.data.api.Repository;
-import org.apache.deltaspike.data.impl.builder.QueryBuilder;
-import org.apache.deltaspike.data.impl.builder.QueryBuilderFactory;
-import org.apache.deltaspike.data.impl.handler.CdiQueryContextHolder;
-import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
-import org.apache.deltaspike.data.impl.handler.EntityManagerRef;
-import org.apache.deltaspike.data.impl.handler.QueryHandler;
-import org.apache.deltaspike.data.impl.handler.QueryRunner;
-import org.apache.deltaspike.data.impl.meta.RepositoryMethod;
-import org.apache.deltaspike.data.spi.QueryInvocationContext;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Specializes;
-import javax.inject.Inject;
-import javax.persistence.PersistenceException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Repository
-@Specializes
-@ApplicationScoped
-public class EntityViewAwareQueryHandler extends QueryHandler {
-    private static final Logger LOG = Logger.getLogger(QueryHandler.class.getName());
-
-    @Inject
-    @Initialized
-    private EntityViewRepositoryComponents components;
-
-    @Inject
-    private EntityManagerRefLookup entityManagerRefLookup;
-
-    @Inject
-    private EntityViewAwareQueryBuilderFactory entityViewAwareQueryBuilderFactory;
-    @Inject
-    private QueryBuilderFactory queryBuilderFactory;
-
-    @Inject
-    private EntityViewQueryRunner entityViewQueryRunner;
-    @Inject
-    private QueryRunner runner;
-
-    @Inject
-    private EntityViewCdiQueryInvocationContextHolder entityViewCdiQueryInvocationContextHolder;
-    @Inject
-    private CdiQueryContextHolder cdiQueryContextHolder;
-
-    @Inject
-    private CriteriaBuilderFactory criteriaBuilderFactory;
-
-    @Inject
-    private EntityViewManagerRefLookup entityViewManagerRefLookup;
-
-    @Override
-    public Object process(Object proxy, Method method, Object[] args) throws Throwable {
-        QueryInvocationContext queryContext = null;
-        EntityManagerRef entityManagerRef = null;
-        EntityViewManagerRef entityViewManagerRef = null;
-        try {
-            List<Class<?>> candidates = ProxyUtils.getProxyAndBaseTypes(proxy.getClass());
-            EntityViewRepositoryComponent repo;
-            try {
-                repo = components.lookupComponent(candidates);
-            } catch (RuntimeException e) {
-                return super.process(proxy, method, args);
-            }
-            RepositoryMethod repoMethod = components.lookupMethod(repo, method);
-
-            entityManagerRef = entityManagerRefLookup.lookupReference(repo);
-            entityViewManagerRef = entityViewManagerRefLookup.lookupReference(repo);
-
-            if (repoMethod instanceof EntityViewRepositoryMethod) {
-                queryContext = new EntityViewCdiQueryInvocationContext(proxy, method, args, (EntityViewRepositoryMethod) repoMethod,
-                        entityManagerRef.getEntityManager(), entityViewManagerRef.getEntityViewManager(), criteriaBuilderFactory);
-                entityViewCdiQueryInvocationContextHolder.set((EntityViewCdiQueryInvocationContext) queryContext);
-                ((EntityViewCdiQueryInvocationContext) queryContext).initMapper();
-                EntityViewQueryBuilder builder = entityViewAwareQueryBuilderFactory.build((EntityViewRepositoryMethod) repoMethod, (EntityViewCdiQueryInvocationContext) queryContext);
-                return entityViewQueryRunner.executeQuery(builder, (EntityViewCdiQueryInvocationContext) queryContext);
-            } else {
-                queryContext = new CdiQueryInvocationContext(proxy, method, args, repoMethod,
-                        entityManagerRef.getEntityManager());
-                cdiQueryContextHolder.set((CdiQueryInvocationContext) queryContext);
-                ((CdiQueryInvocationContext) queryContext).initMapper();
-                QueryBuilder builder = queryBuilderFactory.build(repoMethod, (CdiQueryInvocationContext) queryContext);
-                return runner.executeQuery(builder, (CdiQueryInvocationContext) queryContext);
-            }
-        } catch (PersistenceException e) {
-            throw e;
-        } catch (Exception e) {
-            LOG.log(Level.FINEST, "Query execution error", e);
-            if (queryContext != null) {
-                throw new QueryInvocationException(e, queryContext);
-            }
-            throw new QueryInvocationException(e, proxy.getClass(), method);
-        } finally {
-            if (entityManagerRef != null) {
-                entityManagerRef.release();
-            }
-            if (entityViewManagerRef != null) {
-                entityViewManagerRef.release();
-            }
-            entityViewCdiQueryInvocationContextHolder.dispose();
-            cdiQueryContextHolder.dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
deleted file mode 100644
index ffe9e549e6..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.FullQueryBuilder;
-import com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor;
-import com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderQueryCreator;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryMethod;
-import com.blazebit.persistence.deltaspike.data.impl.param.ExtendedParameters;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.apache.deltaspike.data.api.EntityGraph;
-import org.apache.deltaspike.data.api.SingleResultType;
-import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
-import org.apache.deltaspike.data.impl.graph.EntityGraphHelper;
-import org.apache.deltaspike.data.impl.handler.QueryStringPostProcessor;
-import org.apache.deltaspike.data.impl.util.bean.Destroyable;
-import org.apache.deltaspike.data.spi.QueryInvocationContext;
-
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.QueryHint;
-import java.lang.reflect.Method;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewCdiQueryInvocationContext implements QueryInvocationContext {
-
-    private final EntityManager entityManager;
-    private final EntityViewManager entityViewManager;
-    private final CriteriaBuilderFactory criteriaBuilderFactory;
-    private final ExtendedParameters params;
-    private final Class<?> entityClass;
-    private final Class<?> entityViewClass;
-    private final Object proxy;
-    private final Method method;
-    private final Object[] args;
-    private final EntityViewRepositoryMethod repoMethod;
-    private final List<QueryStringPostProcessor> queryPostProcessors;
-    private final List<com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor> criteriaBuilderPostProcessors;
-    private final List<EntityViewJpaQueryPostProcessor> jpaPostProcessors;
-    private final List<Destroyable> cleanup;
-    private CriteriaBuilderQueryCreator queryCreator;
-    private String queryString;
-
-    public EntityViewCdiQueryInvocationContext(Object proxy, Method method, Object[] args, EntityViewRepositoryMethod repoMethod,
-                                               EntityManager entityManager, EntityViewManager entityViewManager, CriteriaBuilderFactory criteriaBuilderFactory) {
-        this.entityManager = entityManager;
-        this.entityViewManager = entityViewManager;
-        this.criteriaBuilderFactory = criteriaBuilderFactory;
-        this.args = args == null ? new Object[]{} : args;
-        this.params = ExtendedParameters.create(method, this.args, repoMethod);
-        this.proxy = proxy;
-        this.method = method;
-        this.repoMethod = repoMethod;
-        this.entityClass = repoMethod.getRepository().getEntityClass();
-        this.entityViewClass = repoMethod.getEntityViewClass();
-        this.criteriaBuilderPostProcessors = new LinkedList<>();
-        this.queryPostProcessors = new LinkedList<>();
-        this.jpaPostProcessors = new LinkedList<>();
-        this.cleanup = new LinkedList<>();
-    }
-
-    public void initMapper() {
-        if (hasQueryInOutMapper()) {
-            QueryInOutMapper<?> mapper = getQueryInOutMapper();
-            params.applyMapper(mapper);
-            for (int i = 0; i < args.length; i++) {
-                if (mapper.mapsParameter(args[i])) {
-                    args[i] = mapper.mapParameter(args[i]);
-                }
-            }
-        }
-    }
-
-    @Override
-    public EntityManager getEntityManager() {
-        return entityManager;
-    }
-
-    public EntityViewManager getEntityViewManager() {
-        return entityViewManager;
-    }
-
-    public CriteriaBuilderFactory getCriteriaBuilderFactory() {
-        return criteriaBuilderFactory;
-    }
-
-    @Override
-    public boolean isNew(Object entity) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Class<?> getEntityClass() {
-        return entityClass;
-    }
-
-    public Class<?> getEntityViewClass() {
-        return entityViewClass;
-    }
-
-    @Override
-    public Class<?> getRepositoryClass() {
-        return repoMethod.getRepository().getRepositoryClass();
-    }
-
-    public Object proceed() throws Exception {
-        return method.invoke(proxy, args);
-    }
-
-    @Override
-    public Method getMethod() {
-        return method;
-    }
-
-    public Query applyRestrictions(Query query) {
-        return applyRestrictions(query, true);
-    }
-
-    public Query applyRestrictions(Query query, boolean applyFetchGraph) {
-        Method method = getMethod();
-        if (hasLockMode(method)) {
-            query.setLockMode(extractLockMode(method));
-        }
-        if (hasQueryHints(method)) {
-            QueryHint[] hints = extractQueryHints(method);
-            for (QueryHint hint : hints) {
-                query.setHint(hint.name(), hint.value());
-            }
-        }
-        if (applyFetchGraph) {
-            applyEntityGraph(query, method);
-        }
-        return applyJpaQueryPostProcessors(query);
-    }
-
-    public Object[] getMethodParameters() {
-        return args;
-    }
-
-    public void addQueryStringPostProcessor(QueryStringPostProcessor postProcessor) {
-        queryPostProcessors.add(postProcessor);
-    }
-
-    public void addCriteriaBuilderPostProcessor(com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor postProcessor) {
-        criteriaBuilderPostProcessors.add(postProcessor);
-    }
-
-    public void setQueryCreator(CriteriaBuilderQueryCreator queryCreator) {
-        this.queryCreator = queryCreator;
-    }
-
-    public Query createQuery(FullQueryBuilder<?, ?> queryBuilder) {
-        if (queryCreator == null) {
-            return queryBuilder.getQuery();
-        }
-        return queryCreator.createQuery(queryBuilder);
-    }
-
-    public List<com.blazebit.persistence.deltaspike.data.base.handler.CriteriaBuilderPostProcessor> getCriteriaBuilderPostProcessors() {
-        return criteriaBuilderPostProcessors;
-    }
-
-    public boolean hasCriteriaBuilderPostProcessors() {
-        return !criteriaBuilderPostProcessors.isEmpty();
-    }
-
-    public FullQueryBuilder<?, ?> applyCriteriaBuilderPostProcessors(FullQueryBuilder<?, ?> criteriaBuilder) {
-        FullQueryBuilder<?, ?> fullCb = criteriaBuilder;
-        for (CriteriaBuilderPostProcessor processor : criteriaBuilderPostProcessors) {
-            fullCb = processor.postProcess(fullCb);
-        }
-        return fullCb;
-    }
-
-    public void addJpaQueryPostProcessor(EntityViewJpaQueryPostProcessor postProcessor) {
-        jpaPostProcessors.add(postProcessor);
-    }
-
-    public void removeJpaQueryPostProcessor(EntityViewJpaQueryPostProcessor postProcessor) {
-        jpaPostProcessors.remove(postProcessor);
-    }
-
-    public boolean hasQueryStringPostProcessors() {
-        return !queryPostProcessors.isEmpty();
-    }
-
-    public String applyQueryStringPostProcessors(String queryString) {
-        String result = queryString;
-        for (QueryStringPostProcessor processor : queryPostProcessors) {
-            result = processor.postProcess(result);
-        }
-        return result;
-    }
-
-    public Query applyJpaQueryPostProcessors(Query query) {
-        Query result = query;
-        for (EntityViewJpaQueryPostProcessor processor : jpaPostProcessors) {
-            result = processor.postProcess(this, result);
-        }
-        return result;
-    }
-
-    public void addDestroyable(Destroyable destroyable) {
-        cleanup.add(destroyable);
-    }
-
-    public void cleanup() {
-        for (Destroyable destroy : cleanup) {
-            destroy.destroy();
-        }
-        cleanup.clear();
-    }
-
-    public Object executeQuery(Query jpaQuery) {
-        return repoMethod.getEntityViewQueryProcessor().executeQuery(jpaQuery, this);
-    }
-
-    public ExtendedParameters getParams() {
-        return params;
-    }
-
-    public EntityViewRepositoryMethod getRepositoryMethod() {
-        return repoMethod;
-    }
-
-    public String getQueryString() {
-        return queryString;
-    }
-
-    public void setQueryString(String queryString) {
-        this.queryString = queryString;
-    }
-
-    public List<QueryStringPostProcessor> getQueryStringPostProcessors() {
-        return queryPostProcessors;
-    }
-
-    public boolean hasQueryInOutMapper() {
-        return repoMethod.hasQueryInOutMapper();
-    }
-
-    public QueryInOutMapper<?> getQueryInOutMapper() {
-        return repoMethod.getQueryInOutMapperInstance(this);
-    }
-
-    public SingleResultType getSingleResultStyle() {
-        SingleResultType baseSingleResultType = repoMethod.getSingleResultStyle();
-        if (repoMethod.isOptional() && baseSingleResultType == SingleResultType.JPA) {
-            return SingleResultType.OPTIONAL;
-        } else {
-            return baseSingleResultType;
-        }
-    }
-
-    public Object getProxy() {
-        return proxy;
-    }
-
-    private boolean hasLockMode(Method method) {
-        return extractLockMode(method) != null;
-    }
-
-    private LockModeType extractLockMode(Method method) {
-        Class<org.apache.deltaspike.data.api.Query> query = org.apache.deltaspike.data.api.Query.class;
-        if (method.isAnnotationPresent(query) &&
-                method.getAnnotation(query).lock() != LockModeType.NONE) {
-            return method.getAnnotation(query).lock();
-        }
-        return null;
-    }
-
-    private QueryHint[] extractQueryHints(Method method) {
-        Class<org.apache.deltaspike.data.api.Query> query = org.apache.deltaspike.data.api.Query.class;
-        if (method.isAnnotationPresent(query) &&
-                method.getAnnotation(query).hints().length > 0) {
-            return method.getAnnotation(query).hints();
-        }
-        return null;
-    }
-
-    private boolean hasQueryHints(Method method) {
-        return extractQueryHints(method) != null;
-    }
-
-    private void applyEntityGraph(Query query, Method method) {
-        EntityGraph entityGraphAnn = method.getAnnotation(EntityGraph.class);
-        if (entityGraphAnn == null) {
-            return;
-        }
-
-        Object graph = EntityGraphHelper.getEntityGraph(getEntityManager(), entityClass, entityGraphAnn);
-        query.setHint(entityGraphAnn.type().getHintName(), graph);
-    }
-
-    public boolean isOptional() {
-        return this.repoMethod.isOptional();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
deleted file mode 100644
index 283f87e801..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewContext;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import java.util.Stack;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.CdiQueryContextHolder} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ApplicationScoped
-public class EntityViewCdiQueryInvocationContextHolder {
-
-    private final ThreadLocal<Stack<EntityViewCdiQueryInvocationContext>> contextStack = new ThreadLocal<>();
-
-    public void set(EntityViewCdiQueryInvocationContext context) {
-        if (contextStack.get() == null) {
-            contextStack.set(new Stack<EntityViewCdiQueryInvocationContext>());
-        }
-        contextStack.get().push(context);
-    }
-
-    @Produces
-    @EntityViewContext
-    public EntityViewCdiQueryInvocationContext get() {
-        if (contextStack.get() != null && !contextStack.get().isEmpty()) {
-            return contextStack.get().peek();
-        }
-        return null;
-    }
-
-    public void dispose() {
-        if (contextStack.get() != null && !contextStack.get().isEmpty()) {
-            EntityViewCdiQueryInvocationContext ctx = contextStack.get().pop();
-            ctx.cleanup();
-        }
-        if (contextStack.get() != null && contextStack.get().isEmpty()) {
-            contextStack.remove();
-        }
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java
deleted file mode 100644
index fb03789887..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewJpaQueryPostProcessor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import javax.persistence.Query;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public interface EntityViewJpaQueryPostProcessor {
-
-    Query postProcess(EntityViewCdiQueryInvocationContext context, Query query);
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
deleted file mode 100644
index b93382730f..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewManagerRef;
-import com.blazebit.persistence.deltaspike.data.impl.meta.EntityViewRepositoryComponent;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ApplicationScoped
-public class EntityViewManagerRefLookup {
-    private volatile Boolean globalEntityViewManagerInitialized;
-    private boolean globalEntityViewManagerIsNormalScope;
-    private EntityViewManager globalEntityViewManager;
-
-    private void lazyInitGlobalEntityManager() {
-        if (this.globalEntityViewManagerInitialized == null) {
-            initGlobalEntityViewManager();
-        }
-    }
-
-    private synchronized void initGlobalEntityViewManager() {
-        // switch into paranoia mode
-        if (this.globalEntityViewManagerInitialized == null) {
-            this.globalEntityViewManagerInitialized = true;
-
-            BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-            Set<Bean<?>> beans = beanManager.getBeans(EntityViewManager.class);
-            Bean<?> bean = beanManager.resolve(beans);
-
-            if (bean == null) {
-                throw new IllegalStateException("Could not find EntityViewManager with default qualifier.");
-            }
-
-            globalEntityViewManagerIsNormalScope = beanManager.isNormalScope(bean.getScope());
-            if (globalEntityViewManagerIsNormalScope) {
-                globalEntityViewManager = (EntityViewManager) beanManager.getReference(bean,
-                        EntityViewManager.class,
-                        beanManager.createCreationalContext(bean));
-            }
-        }
-    }
-
-    public com.blazebit.persistence.deltaspike.data.base.handler.EntityViewManagerRef lookupReference(final EntityViewRepositoryComponent repository) {
-        com.blazebit.persistence.deltaspike.data.base.handler.EntityViewManagerRef ref = new EntityViewManagerRef();
-
-        if (repository.hasEntityViewManagerResolver()) {
-            ref.setEntityViewManagerResolverClass(
-                    repository.getEntityViewManagerResolverClass());
-
-            if (repository.isEntityManagerResolverIsNormalScope()) {
-                ref.setEntityViewManagerResolver(
-                        BeanProvider.getContextualReference(ref.getEntityViewManagerResolverClass()));
-            } else {
-                ref.setEntityViewManagerResolverDependentProvider(
-                        BeanProvider.getDependent(ref.getEntityViewManagerResolverClass()));
-
-                ref.setEntityViewManagerResolver(
-                        ref.getEntityViewManagerResolverDependentProvider().get());
-            }
-
-            ref.setEntityViewManager(
-                    ref.getEntityViewManagerResolver().resolveEntityViewManager());
-        } else {
-            lazyInitGlobalEntityManager();
-            if (globalEntityViewManagerIsNormalScope) {
-                ref.setEntityViewManager(globalEntityViewManager);
-            } else {
-                ref.setEntityViewManagerDependentProvider(
-                        BeanProvider.getDependent(EntityViewManager.class));
-                ref.setEntityViewManager(
-                        ref.getEntityViewManagerDependentProvider().get());
-            }
-        }
-
-        return ref;
-    }
-}
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
deleted file mode 100644
index c2c909c105..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.PaginatedTypedQuery;
-import com.blazebit.persistence.deltaspike.data.KeysetAwarePage;
-import com.blazebit.persistence.deltaspike.data.KeysetAwareSlice;
-import com.blazebit.persistence.deltaspike.data.Page;
-import com.blazebit.persistence.deltaspike.data.Slice;
-import com.blazebit.persistence.deltaspike.data.base.handler.KeysetAwarePageImpl;
-import com.blazebit.persistence.deltaspike.data.base.handler.KeysetAwareSliceImpl;
-import com.blazebit.persistence.deltaspike.data.impl.builder.result.EntityViewQueryProcessor;
-import org.apache.deltaspike.core.util.OptionalUtil;
-import org.apache.deltaspike.core.util.StreamUtil;
-import org.apache.deltaspike.data.api.Modifying;
-import org.apache.deltaspike.data.api.QueryResult;
-import org.apache.deltaspike.data.api.SingleResultType;
-import org.apache.deltaspike.data.impl.meta.MethodPrefix;
-
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import java.lang.reflect.Method;
-import java.util.List;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.result.QueryProcessorFactory} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewQueryProcessorFactory {
-    private final Method method;
-    private final MethodPrefix methodPrefix;
-
-    private EntityViewQueryProcessorFactory(Method method) {
-        this.method = method;
-        this.methodPrefix = new MethodPrefix("", method.getName());
-    }
-
-    private EntityViewQueryProcessorFactory(Method method, MethodPrefix methodPrefix) {
-        this.method = method;
-        this.methodPrefix = methodPrefix;
-    }
-
-    public static EntityViewQueryProcessorFactory newInstance(Method method) {
-        return new EntityViewQueryProcessorFactory(method);
-    }
-
-    public static EntityViewQueryProcessorFactory newInstance(Method method, MethodPrefix methodPrefix) {
-        return new EntityViewQueryProcessorFactory(method, methodPrefix);
-    }
-
-    public EntityViewQueryProcessor build() {
-        if (returns(QueryResult.class)) {
-            return new EntityViewQueryProcessorFactory.NoOpQueryProcessor();
-        }
-        if (returns(List.class) || returns(PagedList.class)) {
-            return new EntityViewQueryProcessorFactory.ListQueryProcessor();
-        }
-        if (returns(Slice.class) || returns(KeysetAwareSlice.class)) {
-            return new EntityViewQueryProcessorFactory.SliceQueryProcessor();
-        }
-        if (returns(Page.class) || returns(KeysetAwarePage.class)) {
-            return new EntityViewQueryProcessorFactory.PageQueryProcessor();
-        }
-        if (streams()) {
-            return new EntityViewQueryProcessorFactory.StreamQueryProcessor();
-        }
-        if (isModifying()) {
-            return new EntityViewQueryProcessorFactory.ExecuteUpdateQueryProcessor(returns(Void.TYPE));
-        }
-        return new EntityViewQueryProcessorFactory.SingleResultQueryProcessor();
-    }
-
-    private boolean isModifying() {
-        boolean matchesType = Void.TYPE.equals(method.getReturnType()) ||
-                int.class.equals(method.getReturnType()) ||
-                Integer.class.equals(method.getReturnType());
-        return (method.isAnnotationPresent(Modifying.class) && matchesType) || methodPrefix.isDelete();
-    }
-
-    private boolean returns(Class<?> clazz) {
-        return method.getReturnType().isAssignableFrom(clazz);
-    }
-
-    private boolean streams() {
-        return StreamUtil.isStreamReturned(method);
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class ListQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            return query.getResultList();
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class SliceQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            List list;
-            if (query instanceof PaginatedTypedQuery<?>) {
-                list = ((PaginatedTypedQuery) query).getPageResultList();
-            } else {
-                list = query.getResultList();
-            }
-            if (list instanceof PagedList) {
-                return new KeysetAwareSliceImpl<>((PagedList) list, context.getParams().getPageable());
-            } else {
-                return new KeysetAwareSliceImpl<>(list, context.getParams().getPageable());
-            }
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class PageQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            List list = query.getResultList();
-            if (list instanceof PagedList) {
-                return new KeysetAwarePageImpl<>((PagedList) list, context.getParams().getPageable());
-            } else {
-                return new KeysetAwarePageImpl<>(list, context.getParams().getPageable());
-            }
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class NoOpQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            return query;
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class StreamQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            return StreamUtil.wrap(query.getResultList());
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class SingleResultQueryProcessor implements EntityViewQueryProcessor {
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            SingleResultType style = context.getSingleResultStyle();
-            Object result = null;
-            switch (style) {
-                case JPA:
-                    return query.getSingleResult();
-                case OPTIONAL:
-                    try {
-                        result = query.getSingleResult();
-                    } catch (NoResultException e) {
-                    }
-                    break;
-                default:
-                    @SuppressWarnings("unchecked")
-                    List<Object> queryResult = query.getResultList();
-                    result = !queryResult.isEmpty() ? queryResult.get(0) : null;
-            }
-            if (context.isOptional()) {
-                return OptionalUtil.wrap(result);
-            } else {
-                return result;
-            }
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static final class ExecuteUpdateQueryProcessor implements EntityViewQueryProcessor {
-
-        private final boolean returnsVoid;
-
-        private ExecuteUpdateQueryProcessor(boolean returnsVoid) {
-            this.returnsVoid = returnsVoid;
-        }
-
-        @Override
-        public Object executeQuery(Query query, EntityViewCdiQueryInvocationContext context) {
-            int result = query.executeUpdate();
-            if (!returnsVoid) {
-                return result;
-            }
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
deleted file mode 100644
index 235eeaa5dd..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.FullQueryBuilder;
-import com.blazebit.persistence.deltaspike.data.base.handler.AbstractEntityViewAwareRepositoryHandler;
-import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewContext;
-import com.blazebit.persistence.parser.util.JpaMetamodelUtils;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
-import org.apache.deltaspike.data.api.EntityGraph;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRepositoryHandler<E, V, PK extends Serializable> extends AbstractEntityViewAwareRepositoryHandler<E, V, PK> {
-
-    private static final String[] EMPTY = new String[0];
-
-    @Inject
-    @EntityViewContext
-    private EntityViewCdiQueryInvocationContext context;
-
-    @Override
-    protected EntityViewManager entityViewManager() {
-        return context.getEntityViewManager();
-    }
-
-    @Override
-    protected  <T, Q extends FullQueryBuilder<T, Q>> Q applySetting(EntityViewSetting<T, Q> setting, CriteriaBuilder<?> criteriaBuilder) {
-        return context.getEntityViewManager().applySetting(setting, criteriaBuilder);
-    }
-
-    @Override
-    protected String[] getFetches() {
-        EntityGraph entityGraph = context.getMethod().getAnnotation(EntityGraph.class);
-        if (entityGraph == null || entityGraph.paths().length == 0) {
-            return EMPTY;
-        }
-        return entityGraph.paths();
-    }
-
-    @Override
-    protected void applyQueryHints(Query q, boolean applyFetches) {
-        context.applyRestrictions(q, applyFetches);
-    }
-
-    @Override
-    protected EntityManager entityManager() {
-        return context.getEntityManager();
-    }
-
-    @Override
-    protected CriteriaBuilderFactory criteriaBuilderFactory() {
-        return context.getCriteriaBuilderFactory();
-    }
-
-    @Override
-    protected Class<V> viewClass() {
-        return (Class<V>) context.getEntityViewClass();
-    }
-
-    @Override
-    protected Class<E> entityClass() {
-        return (Class<E>) context.getEntityClass();
-    }
-
-    @Override
-    protected boolean isNew(E entity) {
-        return context.isNew(entity);
-    }
-
-    @Override
-    protected String entityName() {
-        return context.getRepositoryMethod().getRepository().getRepositoryEntity().getEntityName();
-    }
-
-    @Override
-    protected String idAttribute() {
-        Class<V> viewClass = viewClass();
-        Class<?> entityClass;
-        if (viewClass == null) {
-            entityClass = entityClass();
-        } else {
-            entityClass = context.getEntityViewManager().getMetamodel().view(viewClass).getEntityClass();
-        }
-        EntityType<?> entityType = context.getEntityManager().getMetamodel().entity(entityClass);
-        return JpaMetamodelUtils.getSingleIdAttribute(entityType).getName();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
deleted file mode 100644
index 3a64d439a2..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
-import com.blazebit.persistence.deltaspike.data.impl.tx.EntityViewInvocationContextWrapper;
-import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.data.impl.handler.EntityRepositoryHandler;
-import org.apache.deltaspike.data.impl.meta.RequiresTransaction;
-import org.apache.deltaspike.jpa.spi.entitymanager.ActiveEntityManagerHolder;
-import org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import java.lang.reflect.Method;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.tx.TransactionalQueryRunner} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@ApplicationScoped
-public class TransactionalEntityViewQueryRunner implements EntityViewQueryRunner {
-
-    @Inject
-    private TransactionStrategy strategy;
-
-    @Inject
-    private ActiveEntityManagerHolder activeEntityManagerHolder;
-
-    @Override
-    public Object executeQuery(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context)
-            throws Throwable {
-        if (needsTransaction(context)) {
-            try {
-                activeEntityManagerHolder.set(context.getEntityManager());
-                return executeTransactional(builder, context);
-            } finally {
-                activeEntityManagerHolder.dispose();
-            }
-        }
-        return executeNonTransactional(builder, context);
-    }
-
-    protected Object executeNonTransactional(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context) {
-        return builder.executeQuery(context);
-    }
-
-    protected Object executeTransactional(final EntityViewQueryBuilder builder, final EntityViewCdiQueryInvocationContext context)
-            throws Exception {
-        return strategy.execute(new EntityViewInvocationContextWrapper(context) {
-            @Override
-            public Object proceed() throws Exception {
-                return builder.executeQuery(context);
-            }
-        });
-    }
-
-    private boolean needsTransaction(EntityViewCdiQueryInvocationContext context) {
-        boolean requiresTx = false;
-        Method method = context.getMethod();
-        if (ClassUtils.containsPossiblyGenericMethod(EntityRepositoryHandler.class, method)) {
-            Method executed = ClassUtils.extractPossiblyGenericMethod(EntityRepositoryHandler.class, method);
-            requiresTx = executed.isAnnotationPresent(RequiresTransaction.class);
-        }
-        return requiresTx || context.getRepositoryMethod().requiresTransaction();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java
deleted file mode 100644
index 38f1e59150..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponent.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.meta;
-
-import com.blazebit.persistence.deltaspike.data.EntityViewManagerConfig;
-import com.blazebit.persistence.deltaspike.data.EntityViewManagerResolver;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.data.api.EntityManagerConfig;
-import org.apache.deltaspike.data.api.EntityManagerResolver;
-import org.apache.deltaspike.data.api.Repository;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.RepositoryComponent;
-import org.apache.deltaspike.data.impl.meta.RepositoryEntity;
-import org.apache.deltaspike.data.impl.meta.RepositoryMethod;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.persistence.FlushModeType;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.RepositoryComponent} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRepositoryComponent extends RepositoryComponent {
-    private static final Logger LOG = Logger.getLogger(EntityViewRepositoryComponent.class.getName());
-
-    private volatile Boolean entityManagerResolverIsNormalScope;
-
-    private final Class<?> repoClass;
-    private final RepositoryEntity repositoryEntity;
-    private final Class<? extends EntityManagerResolver> entityManagerResolver;
-    private final FlushModeType entityManagerFlushMode;
-    private final Class<? extends EntityViewManagerResolver> entityViewManagerResolver;
-
-    private final Map<Method, RepositoryMethod> methods = new HashMap<Method, RepositoryMethod>();
-
-    public EntityViewRepositoryComponent(Class<?> repoClass, RepositoryEntity repositoryEntity, EntityViewManager evm) {
-        super(repoClass, repositoryEntity);
-        this.repoClass = repoClass;
-        this.repositoryEntity = repositoryEntity;
-        this.entityManagerResolver = extractEntityManagerResolver(repoClass);
-        this.entityManagerFlushMode = extractEntityManagerFlushMode(repoClass);
-        this.entityViewManagerResolver = extractEntityViewManagerResolver(repoClass);
-        init(BeanManagerProvider.getInstance().getBeanManager(), evm);
-    }
-
-    private synchronized void init(BeanManager beanManager, EntityViewManager evm) {
-        if (entityManagerResolverIsNormalScope != null) {
-            return;
-        }
-        initialize(evm);
-        if (entityManagerResolver != null && beanManager != null) {
-            final Set<Bean<?>> beans = beanManager.getBeans(entityManagerResolver);
-            final Class<? extends Annotation> scope = beanManager.resolve(beans).getScope();
-            entityManagerResolverIsNormalScope = beanManager.isNormalScope(scope);
-        } else {
-            entityManagerResolverIsNormalScope = false;
-        }
-    }
-
-    public boolean isEntityManagerResolverIsNormalScope() {
-        return entityManagerResolverIsNormalScope;
-    }
-
-    public String getEntityName() {
-        return repositoryEntity.getEntityName();
-    }
-
-    /**
-     * Looks up method meta data by a Method object.
-     *
-     * @param method The Repository method.
-     * @return Method meta data.
-     */
-    public RepositoryMethod lookupMethod(Method method) {
-        return methods.get(method);
-    }
-
-    /**
-     * Looks up the method type by a Method object.
-     *
-     * @param method The Repository method.
-     * @return Method meta data.
-     */
-    public MethodType lookupMethodType(Method method) {
-        return lookupMethod(method).getMethodType();
-    }
-
-    /**
-     * Gets the entity class related the Repository.
-     *
-     * @return The class of the entity related to the Repository.
-     */
-    public Class<?> getEntityClass() {
-        return repositoryEntity.getEntityClass();
-    }
-
-    public RepositoryEntity getRepositoryEntity() {
-        return repositoryEntity;
-    }
-
-    /**
-     * Returns the original Repository class this meta data is related to.
-     *
-     * @return The class of the Repository.
-     */
-    public Class<?> getRepositoryClass() {
-        return repoClass;
-    }
-
-    public boolean hasEntityManagerResolver() {
-        return getEntityManagerResolverClass() != null;
-    }
-
-    public Class<? extends EntityManagerResolver> getEntityManagerResolverClass() {
-        return entityManagerResolver;
-    }
-
-    public boolean hasEntityViewManagerResolver() {
-        return getEntityViewManagerResolverClass() != null;
-    }
-
-    public Class<? extends EntityViewManagerResolver> getEntityViewManagerResolverClass() {
-        return entityViewManagerResolver;
-    }
-
-    public boolean hasEntityManagerFlushMode() {
-        return entityManagerFlushMode != null;
-    }
-
-    public FlushModeType getEntityManagerFlushMode() {
-        return entityManagerFlushMode;
-    }
-
-    private void initialize(EntityViewManager evm) {
-        Collection<Class<?>> allImplemented = collectClasses();
-        for (Class<?> implemented : allImplemented) {
-            Method[] repoClassMethods = implemented.getDeclaredMethods();
-            for (Method repoClassMethod : repoClassMethods) {
-                RepositoryMethod repoMethod = EntityViewRepositoryMethod.create(this, repoClassMethod, evm);
-                methods.put(repoClassMethod, repoMethod);
-            }
-        }
-    }
-
-    private Set<Class<?>> collectClasses() {
-        Set<Class<?>> result = new HashSet<Class<?>>();
-        collectClasses(repoClass, result);
-        LOG.log(Level.FINER, "collectClasses(): Found {0} for {1}", new Object[]{result, repoClass});
-        return result;
-    }
-
-    private void collectClasses(Class<?> cls, Set<Class<?>> result) {
-        if (cls == null || cls == Object.class) {
-            return;
-        }
-        result.add(cls);
-        for (Class<?> child : cls.getInterfaces()) {
-            collectClasses(child, result);
-        }
-        collectClasses(cls.getSuperclass(), result);
-    }
-
-    private Class<? extends EntityManagerResolver> extractEntityManagerResolver(Class<?> clazz) {
-        EntityManagerConfig config = extractEntityManagerConfig(clazz);
-        if (config != null && !EntityManagerResolver.class.equals(config.entityManagerResolver())) {
-            return config.entityManagerResolver();
-        }
-        return null;
-    }
-
-    private FlushModeType extractEntityManagerFlushMode(Class<?> clazz) {
-        EntityManagerConfig config = extractEntityManagerConfig(clazz);
-        if (config != null) {
-            return config.flushMode();
-        }
-        return null;
-    }
-
-    private EntityManagerConfig extractEntityManagerConfig(Class<?> clazz) {
-        if (clazz.isAnnotationPresent(EntityManagerConfig.class)) {
-            return clazz.getAnnotation(EntityManagerConfig.class);
-        }
-        return null;
-    }
-
-    private Class<? extends EntityViewManagerResolver> extractEntityViewManagerResolver(Class<?> clazz) {
-        EntityViewManagerConfig config = extractEntityViewManagerConfig(clazz);
-        if (config != null && !EntityViewManagerResolver.class.equals(config.entityViewManagerResolver())) {
-            return config.entityViewManagerResolver();
-        }
-        return null;
-    }
-
-    private EntityViewManagerConfig extractEntityViewManagerConfig(Class<?> clazz) {
-        if (clazz.isAnnotationPresent(EntityViewManagerConfig.class)) {
-            return clazz.getAnnotation(EntityViewManagerConfig.class);
-        }
-        return null;
-    }
-
-    public String getCustomMethodPrefix() {
-        return repoClass.getAnnotation(Repository.class).methodPrefix();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java
deleted file mode 100644
index de4b0a201f..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponents.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.meta;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import org.apache.deltaspike.data.impl.RepositoryDefinitionException;
-import org.apache.deltaspike.data.impl.meta.RepositoryComponent;
-import org.apache.deltaspike.data.impl.meta.RepositoryEntity;
-import org.apache.deltaspike.data.impl.meta.RepositoryMethod;
-import org.apache.deltaspike.data.impl.meta.extractor.AnnotationMetadataExtractor;
-import org.apache.deltaspike.data.impl.meta.extractor.MetadataExtractor;
-import org.apache.deltaspike.data.impl.meta.extractor.TypeMetadataExtractor;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.RepositoryComponents} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRepositoryComponents {
-    private final Map<Class<?>, EntityViewRepositoryComponent> repos = new ConcurrentHashMap<Class<?>, EntityViewRepositoryComponent>();
-
-    private final List<MetadataExtractor> extractors = Arrays.asList(new AnnotationMetadataExtractor(), new TypeMetadataExtractor());
-
-    /**
-     * Add a Repository class to the meta data repository.
-     *
-     * @param repoClass The repo class.
-     */
-    public void add(Class<?> repoClass, EntityViewManager evm) {
-        RepositoryEntity entityClass = extractEntityMetaData(repoClass, evm);
-        EntityViewRepositoryComponent repo = new EntityViewRepositoryComponent(repoClass, entityClass, evm);
-        repos.put(repoClass, repo);
-    }
-
-    /**
-     * Repository access - lookup the Repository component meta data from a list of candidate classes.
-     * Depending on the implementation, proxy objects might have been modified so the actual class
-     * does not match the original Repository class.
-     *
-     * @param candidateClasses List of candidates to check.
-     * @return A {@link RepositoryComponent} corresponding to the repoClass parameter.
-     */
-    public EntityViewRepositoryComponent lookupComponent(List<Class<?>> candidateClasses) {
-        for (Class<?> repoClass : candidateClasses) {
-            if (repos.containsKey(repoClass)) {
-                return repos.get(repoClass);
-            }
-        }
-        throw new RuntimeException("Unknown Repository classes " + candidateClasses);
-    }
-
-    /**
-     * Repository access - lookup the Repository component meta data for a specific Repository class.
-     *
-     * @param repoClass The Repository class to lookup the method for
-     * @return A {@link RepositoryComponent} corresponding to the repoClass parameter.
-     */
-    public EntityViewRepositoryComponent lookupComponent(Class<?> repoClass) {
-        if (repos.containsKey(repoClass)) {
-            return repos.get(repoClass);
-        }
-        throw new RuntimeException("Unknown Repository class " + repoClass.getName());
-    }
-
-    /**
-     * Repository access - lookup method information for a specific Repository class.
-     *
-     * @param repoClass The Repository class to lookup the method for
-     * @param method    The Method object to get Repository meta data for.
-     * @return A {@link RepositoryMethod} corresponding to the method parameter.
-     */
-    public RepositoryMethod lookupMethod(Class<?> repoClass, Method method) {
-        return lookupComponent(repoClass).lookupMethod(method);
-    }
-
-    public RepositoryMethod lookupMethod(EntityViewRepositoryComponent component, Method method) {
-        return component.lookupMethod(method);
-    }
-
-    private RepositoryEntity extractEntityMetaData(Class<?> repoClass, EntityViewManager evm) {
-        for (MetadataExtractor extractor : extractors) {
-            RepositoryEntity entity = extractor.extract(repoClass);
-            if (entity != null) {
-                return entity;
-            }
-        }
-        throw new RepositoryDefinitionException(repoClass);
-    }
-
-    public Map<Class<?>, EntityViewRepositoryComponent> getRepositories() {
-        return repos;
-    }
-
-    public void addAll(Map<Class<?>, EntityViewRepositoryComponent> repositories) {
-        this.repos.putAll(repositories);
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java
deleted file mode 100644
index 491dc8b769..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryComponentsFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.meta;
-
-import com.blazebit.persistence.deltaspike.data.impl.EntityViewRepositoryExtension;
-import org.apache.deltaspike.core.api.lifecycle.Initialized;
-import org.apache.deltaspike.data.impl.meta.RepositoryComponents;
-import org.apache.deltaspike.data.impl.meta.RepositoryComponentsFactory;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Specializes;
-import javax.inject.Inject;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRepositoryComponentsFactory extends RepositoryComponentsFactory {
-
-    @Inject
-    private EntityViewRepositoryExtension extension;
-
-    @Override
-    @Produces
-    @ApplicationScoped
-    @Initialized
-    @Specializes
-    public RepositoryComponents producer() {
-        return extension.getComponents();
-    }
-
-    @Produces
-    @ApplicationScoped
-    @Initialized
-    public EntityViewRepositoryComponents createEntityViewRepositoryComponents() {
-        return extension.getEntityViewRepositoryComponents();
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java
deleted file mode 100644
index b82283ac28..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewRepositoryMethod.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.meta;
-
-import com.blazebit.persistence.deltaspike.data.impl.builder.part.EntityViewQueryRoot;
-import com.blazebit.persistence.deltaspike.data.impl.builder.result.EntityViewQueryProcessor;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewQueryProcessorFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.reflection.ReflectionUtils;
-import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.api.provider.DependentProvider;
-import org.apache.deltaspike.core.util.OptionalUtil;
-import org.apache.deltaspike.data.api.Modifying;
-import org.apache.deltaspike.data.api.Query;
-import org.apache.deltaspike.data.api.SingleResultType;
-import org.apache.deltaspike.data.api.mapping.MappingConfig;
-import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
-import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
-import org.apache.deltaspike.data.impl.meta.MethodPrefix;
-import org.apache.deltaspike.data.impl.meta.MethodType;
-import org.apache.deltaspike.data.impl.meta.RepositoryMethod;
-import org.apache.deltaspike.data.impl.util.bean.DependentProviderDestroyable;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.persistence.LockModeType;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Set;
-
-import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.meta.RepositoryMethod} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRepositoryMethod extends RepositoryMethod {
-
-    private final Method method;
-    private final MethodType methodType;
-    private final MethodPrefix methodPrefix;
-    private final EntityViewRepositoryComponent repo;
-    private final EntityViewQueryRoot queryRoot;
-    private final EntityViewQueryProcessor queryProcessor;
-    private final Class<? extends QueryInOutMapper<?>> mapper;
-    private final Class<?> entityViewClass;
-    private final boolean isOptional;
-
-    private volatile Boolean queryInOutMapperIsNormalScope;
-
-    public EntityViewRepositoryMethod(Method method, EntityViewRepositoryComponent repo, Class<?> entityViewClass) {
-        super(method, repo);
-        this.method = method;
-        this.repo = repo;
-        this.methodPrefix = new MethodPrefix(repo.getCustomMethodPrefix(), method.getName());
-        this.methodType = extractMethodType();
-        this.entityViewClass = entityViewClass;
-        this.queryRoot = initQueryRoot();
-        this.queryProcessor = EntityViewQueryProcessorFactory.newInstance(method, methodPrefix).build();
-        this.mapper = extractMapper(method, repo);
-        this.isOptional = OptionalUtil.isOptionalReturned(this.method);
-    }
-
-    public boolean returns(Class<?> returnType) {
-        return returnType.equals(method.getReturnType());
-    }
-
-    public QueryInOutMapper<?> getQueryInOutMapperInstance(EntityViewCdiQueryInvocationContext context) {
-        if (!hasQueryInOutMapper()) {
-            return null;
-        }
-        QueryInOutMapper<?> result = null;
-        lazyInit();
-        if (!queryInOutMapperIsNormalScope) {
-            final DependentProvider<? extends QueryInOutMapper<?>> mappedProvider = BeanProvider.getDependent(mapper);
-            result = mappedProvider.get();
-            context.addDestroyable(new DependentProviderDestroyable(mappedProvider));
-        } else {
-            result = BeanProvider.getContextualReference(mapper);
-        }
-        return result;
-    }
-
-    public boolean isQuery() {
-        return methodType == MethodType.ANNOTATED;
-    }
-
-    private MethodType extractMethodType() {
-        if (isAnnotated()) {
-            return MethodType.ANNOTATED;
-        }
-        if (isMethodExpression()) {
-            return MethodType.PARSE;
-        }
-        return MethodType.DELEGATE;
-    }
-
-    public static RepositoryMethod create(EntityViewRepositoryComponent repo, Method method, EntityViewManager evm) {
-        Class<?> entityViewClass = extractEntityViewClass(repo, method, evm);
-        return new EntityViewRepositoryMethod(method, repo, entityViewClass);
-    }
-
-    public static Class<?> extractEntityViewClass(EntityViewRepositoryComponent repo, Method method, EntityViewManager evm) {
-        Class<?> returnType = ReflectionUtils.getResolvedMethodReturnType(repo.getRepositoryClass(), method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnType);
-
-        if (managedViewType != null) {
-            return managedViewType.getJavaType();
-        } else if (returnType.getTypeParameters().length > 0) {
-            Class<?> firstReturnTypeArgument = ReflectionUtils.getResolvedMethodReturnTypeArguments(repo.getRepositoryClass(), method)[0];
-            managedViewType = evm.getMetamodel().managedView(firstReturnTypeArgument);
-            if (managedViewType != null) {
-                return managedViewType.getJavaType();
-            }
-        }
-        return null;
-    }
-
-    private EntityViewQueryRoot initQueryRoot() {
-        if (methodType == MethodType.PARSE) {
-            return EntityViewQueryRoot.create(method.getName(), repo, methodPrefix);
-        }
-        return null;
-    }
-
-    private boolean isMethodExpression() {
-        if (!Modifier.isAbstract(method.getModifiers())) {
-            return false;
-        }
-        try {
-            EntityViewQueryRoot.create(method.getName(), repo, methodPrefix);
-            return true;
-        } catch (MethodExpressionException e) {
-            return false;
-        }
-    }
-
-    private boolean isAnnotated() {
-        if (method.isAnnotationPresent(Query.class)) {
-            Query query = method.getAnnotation(Query.class);
-            return isValid(query);
-        }
-        return false;
-    }
-
-    private boolean isValid(Query query) {
-        return isNotEmpty(query.value()) || isNotEmpty(query.named());
-    }
-
-    private Class<? extends QueryInOutMapper<?>> extractMapper(Method queryMethod, EntityViewRepositoryComponent repoComponent) {
-        if (queryMethod.isAnnotationPresent(MappingConfig.class)) {
-            return queryMethod.getAnnotation(MappingConfig.class).value();
-        }
-        if (repoComponent.getRepositoryClass().isAnnotationPresent(MappingConfig.class)) {
-            return repoComponent.getRepositoryClass().getAnnotation(MappingConfig.class).value();
-        }
-        return null;
-    }
-
-    //don't trigger this lookup during ProcessAnnotatedType
-    private void lazyInit() {
-        if (queryInOutMapperIsNormalScope == null) {
-            init(BeanManagerProvider.getInstance().getBeanManager());
-        }
-    }
-
-    private synchronized void init(BeanManager beanManager) {
-        if (queryInOutMapperIsNormalScope != null) {
-            return;
-        }
-
-        if (beanManager != null) {
-            final Set<Bean<?>> beans = beanManager.getBeans(mapper);
-            final Class<? extends Annotation> scope = beanManager.resolve(beans).getScope();
-            queryInOutMapperIsNormalScope = beanManager.isNormalScope(scope);
-        } else {
-            queryInOutMapperIsNormalScope = false;
-        }
-    }
-
-    public MethodType getMethodType() {
-        return methodType;
-    }
-
-    public EntityViewRepositoryComponent getRepository() {
-        return repo;
-    }
-
-    public EntityViewQueryRoot getEntityViewQueryRoot() {
-        return queryRoot;
-    }
-
-    public EntityViewQueryProcessor getEntityViewQueryProcessor() {
-        return queryProcessor;
-    }
-
-    public boolean hasQueryInOutMapper() {
-        return mapper != null;
-    }
-
-    public int getDefinedMaxResults() {
-        try {
-            Method getDefinedMaxResultsMethod = MethodPrefix.class.getDeclaredMethod("getDefinedMaxResults");
-            getDefinedMaxResultsMethod.setAccessible(true);
-            return (int) getDefinedMaxResultsMethod.invoke(methodPrefix);
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public SingleResultType getSingleResultStyle() {
-        return methodPrefix.getSingleResultStyle();
-    }
-
-    public boolean requiresTransaction() {
-        boolean hasLockMode = false;
-        if (method.isAnnotationPresent(Query.class)) {
-            hasLockMode = !method.getAnnotation(Query.class).lock().equals(LockModeType.NONE);
-        }
-        return hasLockMode || method.isAnnotationPresent(Modifying.class);
-    }
-
-    public boolean isOptional() {
-        return this.isOptional;
-    }
-
-    public Class<?> getEntityViewClass() {
-        return entityViewClass;
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java b/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
deleted file mode 100644
index c7790cdbfb..0000000000
--- a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.param;
-
-import com.blazebit.persistence.deltaspike.data.PageRequest;
-import com.blazebit.persistence.deltaspike.data.Pageable;
-import com.blazebit.persistence.deltaspike.data.Specification;
-import com.blazebit.persistence.deltaspike.data.base.builder.OffsetPageRequest;
-import org.apache.deltaspike.data.api.FirstResult;
-import org.apache.deltaspike.data.api.MaxResults;
-import org.apache.deltaspike.data.api.QueryParam;
-import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
-import org.apache.deltaspike.data.impl.meta.RepositoryMethod;
-import org.apache.deltaspike.data.impl.param.IndexedParameter;
-import org.apache.deltaspike.data.impl.param.NamedParameter;
-import org.apache.deltaspike.data.impl.param.Parameter;
-
-import javax.persistence.Query;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.param.Parameters} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class ExtendedParameters {
-    private static final Logger LOG = Logger.getLogger(ExtendedParameters.class.getName());
-
-    private static final int DEFAULT_MAX = Integer.MAX_VALUE;
-    private static final int DEFAULT_FIRST = 0;
-
-    private final List<Parameter> parameterList;
-    private final Pageable pageable;
-    private final Specification<?> specification;
-
-    private ExtendedParameters(List<Parameter> parameters, Pageable pageable, Specification<?> specification) {
-        this.parameterList = parameters;
-        this.pageable = pageable;
-        this.specification = specification;
-    }
-
-    public static ExtendedParameters createEmpty() {
-        List<Parameter> empty = Collections.emptyList();
-        return new ExtendedParameters(empty, new PageRequest(null, DEFAULT_FIRST, DEFAULT_MAX), null);
-    }
-
-    public static ExtendedParameters create(Method method, Object[] parameters, RepositoryMethod repositoryMethod) {
-        int max = extractSizeRestriction(method, repositoryMethod);
-        int first = DEFAULT_FIRST;
-        List<Parameter> result = new ArrayList<Parameter>(parameters.length);
-        int paramIndex = 1;
-        Annotation[][] annotations = method.getParameterAnnotations();
-        Class<?>[] parameterTypes = method.getParameterTypes();
-        Pageable pageable = null;
-        Specification<?> specification = null;
-        for (int i = 0; i < parameters.length; i++) {
-            // Extended for support of Pageable and Specification parameters
-            if (Pageable.class.isAssignableFrom(parameterTypes[i])) {
-                pageable = (Pageable) parameters[i];
-            } else if (Specification.class.isAssignableFrom(parameterTypes[i])) {
-                specification = (Specification) parameters[i];
-            } else if (isParameter(annotations[i])) {
-                QueryParam qpAnnotation = extractFrom(annotations[i], QueryParam.class);
-                if (qpAnnotation != null) {
-                    result.add(new NamedParameter(qpAnnotation.value(), parameters[i]));
-                } else {
-                    result.add(new IndexedParameter(paramIndex++, parameters[i]));
-                }
-            } else {
-                max = extractInt(parameters[i], annotations[i], MaxResults.class, max);
-                first = extractInt(parameters[i], annotations[i], FirstResult.class, first);
-            }
-        }
-        if (pageable == null) {
-            if (first > DEFAULT_FIRST || max > 0 && max < Integer.MAX_VALUE) {
-                pageable = new OffsetPageRequest(first, max);
-            }
-        }
-        return new ExtendedParameters(result, pageable, specification);
-    }
-
-    public Pageable getPageable() {
-        return pageable;
-    }
-
-    public Specification<?> getSpecification() {
-        return specification;
-    }
-
-    public void applyMapper(QueryInOutMapper<?> mapper) {
-        for (Parameter param : parameterList) {
-            param.applyMapper(mapper);
-        }
-    }
-
-    public Query applyTo(Query query) {
-        for (Parameter param : parameterList) {
-            param.apply(query);
-        }
-        return query;
-    }
-
-    private static int extractSizeRestriction(Method method, RepositoryMethod repositoryMethod) {
-        if (method.isAnnotationPresent(org.apache.deltaspike.data.api.Query.class)) {
-            return method.getAnnotation(org.apache.deltaspike.data.api.Query.class).max();
-        }
-        return repositoryMethod.getDefinedMaxResults();
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <A extends Annotation> A extractFrom(Annotation[] annotations, Class<A> target) {
-        for (Annotation annotation : annotations) {
-            if (annotation.annotationType().isAssignableFrom(target)) {
-                return (A) annotation;
-            }
-        }
-        return null;
-    }
-
-    private static <A extends Annotation> int extractInt(Object parameter, Annotation[] annotations, Class<A> target, int defaultVal) {
-        if (parameter != null) {
-            A result = extractFrom(annotations, target);
-            if (result != null) {
-                if (parameter instanceof Integer) {
-                    return (Integer) parameter;
-                } else {
-                    LOG.log(Level.WARNING, "Method parameter extraction: " +
-                                    "Param type must be int: {0}->is:{1}",
-                            new Object[]{target, parameter.getClass()});
-                }
-            }
-        }
-        return defaultVal;
-    }
-
-    private static boolean isParameter(Annotation[] annotations) {
-        return extractFrom(annotations, MaxResults.class) == null &&
-                extractFrom(annotations, FirstResult.class) == null;
-    }
-
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/pom.xml b/integration/deltaspike-data/impl-1.8/pom.xml
deleted file mode 100644
index bca66c5b2e..0000000000
--- a/integration/deltaspike-data/impl-1.8/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
-
-    <name>Blazebit Persistence Integration DeltaSpike Data Impl 1.8</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.deltaspike.data.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-deltaspike-data-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.core</groupId>
-            <artifactId>deltaspike-core-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-data-module-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-data-module-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-jpa-module-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-partial-bean-module-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.deltaspike.data;
-                                        exports com.blazebit.persistence.deltaspike.data.impl;
-                                        provides javax.enterprise.inject.spi.Extension with com.blazebit.persistence.deltaspike.data.impl.EntityViewRepositoryExtension;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <!-- The following profile is not really useful, but it seems IntelliJ needs it for importing the proejct -->
-        <profile>
-            <id>deltaspike-1.7</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.8}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.8</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.8}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.9</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.9}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
deleted file mode 100644
index 2a37c29e86..0000000000
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.handler;
-
-import com.blazebit.persistence.deltaspike.data.impl.builder.EntityViewQueryBuilder;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.handler.QueryRunner} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public interface EntityViewQueryRunner {
-
-    Object executeQuery(EntityViewQueryBuilder builder, EntityViewCdiQueryInvocationContext context) throws Throwable;
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java b/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
deleted file mode 100644
index 6bb387bbfb..0000000000
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.deltaspike.data.impl.tx;
-
-import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
-import org.apache.deltaspike.core.util.interceptor.AbstractInvocationContext;
-
-/**
- * Implementation is similar to {@link org.apache.deltaspike.data.impl.tx.InvocationContextWrapper} but was modified to
- * work with entity views.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-public abstract class EntityViewInvocationContextWrapper extends AbstractInvocationContext<Object> {
-    public EntityViewInvocationContextWrapper(EntityViewCdiQueryInvocationContext context) {
-        super(context.getProxy(), context.getMethod(), context.getMethodParameters(), null);
-    }
-}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties
deleted file mode 100644
index c69d8b89ff..0000000000
--- a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/apache-deltaspike.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.deltaspike.core.spi.activation.ClassDeactivator=com.blazebit.persistence.deltaspike.data.impl.DeltaspikeExtensionDeactivator
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml b/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index d52d46f9d1..0000000000
--- a/integration/deltaspike-data/impl-1.8/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans
-        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-        bean-discovery-mode="all"
-        version="1.1">
-</beans>
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-2.0/pom.xml b/integration/deltaspike-data/impl-2.0/pom.xml
new file mode 100644
index 0000000000..04084a86f9
--- /dev/null
+++ b/integration/deltaspike-data/impl-2.0/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
+        <groupId>com.blazebit</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
+
+    <name>Blazebit Persistence Integration DeltaSpike Data Impl 2.0</name>
+
+    <properties>
+        <module.name>com.blazebit.persistence.integration.deltaspike.data.impl</module.name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-deltaspike-data-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jpa-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-partial-bean-module-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <!-- The following profile is not really useful, but it seems IntelliJ needs it for importing the project -->
+        <profile>
+            <id>deltaspike-2.0</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.deltaspike.distribution</groupId>
+                        <artifactId>distributions-bom</artifactId>
+                        <version>${version.deltaspike-2.0}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
similarity index 94%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
index 490ccb38f5..de642d5b37 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/CustomPartialBeanBindingExtension.java
@@ -5,16 +5,14 @@
 
 package com.blazebit.persistence.deltaspike.data.impl;
 
-import com.blazebit.apt.service.ServiceProvider;
 import org.apache.deltaspike.data.api.Repository;
 import org.apache.deltaspike.data.impl.handler.QueryHandler;
 import org.apache.deltaspike.partialbean.impl.PartialBeanBindingExtension;
 import org.apache.deltaspike.partialbean.impl.PartialBeanDescriptor;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
@@ -25,7 +23,6 @@
  * @author Moritz Becker
  * @since 1.2.0
  */
-@ServiceProvider(Extension.class)
 public class CustomPartialBeanBindingExtension extends PartialBeanBindingExtension {
 
     private boolean isActivated() {
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/DeltaspikeExtensionDeactivator.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
similarity index 87%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
index 2827fe6c2f..82bf09f846 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAnnotatedQueryBuilder.java
@@ -12,9 +12,9 @@
 import org.apache.deltaspike.data.impl.param.Parameters;
 import org.apache.deltaspike.data.impl.util.jpa.QueryStringExtractorFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.util.List;
@@ -37,17 +37,17 @@ public class EntityViewAnnotatedQueryBuilder extends EntityViewQueryBuilder {
     public Object execute(EntityViewCdiQueryInvocationContext context) {
         Method method = context.getMethod();
         Query query = method.getAnnotation(Query.class);
-        javax.persistence.Query jpaQuery = createJpaQuery(query, context);
+        jakarta.persistence.Query jpaQuery = createJpaQuery(query, context);
         return context.executeQuery(jpaQuery);
     }
 
-    private javax.persistence.Query createJpaQuery(Query query, CdiQueryInvocationContext context) {
+    private jakarta.persistence.Query createJpaQuery(Query query, CdiQueryInvocationContext context) {
         EntityManager entityManager = context.getEntityManager();
         Parameters params = context.getParams();
-        javax.persistence.Query result = null;
+        jakarta.persistence.Query result = null;
         if (isNotEmpty(query.named())) {
             if (context.hasQueryStringPostProcessors()) {
-                javax.persistence.Query namedQuery = entityManager.createNamedQuery(query.named());
+                jakarta.persistence.Query namedQuery = entityManager.createNamedQuery(query.named());
                 String named = factory.extract(namedQuery);
                 String jpqlQuery = context.applyQueryStringPostProcessors(named);
                 result = params.applyTo(entityManager.createQuery(jpqlQuery));
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
similarity index 95%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
index 9682342457..197aa5dc31 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewAwareQueryBuilderFactory.java
@@ -11,8 +11,8 @@
 import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
 import org.apache.deltaspike.data.impl.meta.RepositoryMethodType;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.QueryBuilderFactory} but was modified to
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
similarity index 93%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
index 6dfdf69eb0..d3a98dffae 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewDelegateQueryBuilder.java
@@ -14,13 +14,13 @@
 import org.apache.deltaspike.data.api.QueryInvocationException;
 import org.apache.deltaspike.data.impl.util.bean.BeanDestroyable;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.PersistenceException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.persistence.PersistenceException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
index 156ff5fed5..47b2e13628 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewMethodQueryBuilder.java
@@ -17,9 +17,9 @@
 import com.blazebit.persistence.deltaspike.data.impl.handler.EntityViewCdiQueryInvocationContext;
 import com.blazebit.persistence.deltaspike.data.impl.param.ExtendedParameters;
 
-import javax.persistence.Query;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 /**
  * Implementation is similar to {@link org.apache.deltaspike.data.impl.builder.MethodQueryBuilder} but was modified to
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
similarity index 97%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
index 91198760ff..9f80fb7be4 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/EntityViewQueryBuilder.java
@@ -9,7 +9,7 @@
 import org.apache.deltaspike.data.api.QueryResult;
 import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/WrappedEntityViewQueryBuilder.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
similarity index 95%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
index d9f68105c4..e383a3af35 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/part/EntityViewQueryRoot.java
@@ -17,9 +17,9 @@
 import org.apache.deltaspike.data.impl.builder.MethodExpressionException;
 import org.apache.deltaspike.data.impl.meta.RepositoryMethodPrefix;
 
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -102,7 +102,7 @@ public void apply(CriteriaBuilder<?> cb) {
         }
     }
 
-    public void apply(Root<?> root, CriteriaQuery<?> query, javax.persistence.criteria.CriteriaBuilder cb) {
+    public void apply(Root<?> root, CriteriaQuery<?> query, jakarta.persistence.criteria.CriteriaBuilder cb) {
         if (specification != null) {
             query.where(specification.toPredicate((Root) root, query, cb));
         }
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
similarity index 98%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
index 78a121f61c..48da3515d9 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/builder/result/EntityViewDefaultQueryResult.java
@@ -23,11 +23,11 @@
 import org.apache.deltaspike.data.impl.builder.postprocessor.OrderByQueryStringPostProcessor;
 import org.apache.deltaspike.data.impl.handler.QueryStringPostProcessor;
 
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Iterator;
 import java.util.List;
 
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
index 5fb680b4d7..50c8f04805 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/CriteriaSupportHandler.java
@@ -31,12 +31,12 @@
 import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTime;
 import org.apache.deltaspike.data.impl.criteria.selection.temporal.CurrentTimestamp;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
index 6d90400713..a31586cce2 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewAwareQueryHandler.java
@@ -24,11 +24,11 @@
 import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerRef;
 import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerRefLookup;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Specializes;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
similarity index 97%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
index 718030c16f..ef4cf3b4fb 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContext.java
@@ -18,10 +18,10 @@
 import org.apache.deltaspike.data.impl.graph.EntityGraphHelper;
 import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.QueryHint;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Query;
+import jakarta.persistence.QueryHint;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
similarity index 93%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
index 283f87e801..8f87c4f7a6 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewCdiQueryInvocationContextHolder.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.deltaspike.data.base.handler.EntityViewContext;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import java.util.Stack;
 
 /**
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewDelegateQueryHandler.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
index 34e90a19b2..80ce447dc5 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewManagerRefLookup.java
@@ -11,9 +11,9 @@
 import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 import java.util.Set;
 
 /**
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
index 5352297e97..25700f7d52 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryProcessorFactory.java
@@ -19,9 +19,9 @@
 import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
 import org.apache.deltaspike.data.impl.meta.RepositoryMethodMetadata;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Specializes;
-import javax.persistence.Query;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewQueryRunner.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
similarity index 95%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
index ee8e5fc2ba..c4b7d1b144 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
@@ -15,10 +15,10 @@
 import com.blazebit.persistence.view.EntityViewSetting;
 import org.apache.deltaspike.data.api.EntityGraph;
 
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
 import java.io.Serializable;
 
 /**
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
similarity index 96%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
index f143dbce80..e8d1c8ffc1 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/handler/TransactionalEntityViewQueryRunner.java
@@ -10,8 +10,8 @@
 import org.apache.deltaspike.jpa.spi.entitymanager.ActiveEntityManagerHolder;
 import org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  * Implementation is similar to {@link org.apache.deltaspike.data.impl.tx.TransactionalQueryRunner} but was modified to
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadata.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
similarity index 95%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
index 0a7bbddab4..0cdf949d67 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMetadataInitializer.java
@@ -16,13 +16,13 @@
 import org.apache.deltaspike.jpa.api.entitymanager.EntityManagerResolver;
 import org.apache.deltaspike.jpa.spi.entitymanager.QualifierBackedEntityManagerResolver;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.FlushModeType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.persistence.FlushModeType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.HashMap;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadata.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
similarity index 97%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
index 6fcb30ad37..e3030f613d 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/EntityViewAwareRepositoryMethodMetadataInitializer.java
@@ -32,12 +32,12 @@
 import org.apache.deltaspike.data.impl.meta.RequiresTransaction;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.LockModeType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.persistence.LockModeType;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
similarity index 99%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
index 5b5dc38253..905f8b212a 100644
--- a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/param/ExtendedParameters.java
@@ -18,7 +18,7 @@
 import org.apache.deltaspike.data.impl.param.NamedParameter;
 import org.apache.deltaspike.data.impl.param.Parameter;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.7/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/tx/EntityViewInvocationContextWrapper.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/OptionalUtils.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/OptionalUtils.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/OptionalUtils.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/OptionalUtils.java
diff --git a/integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/StreamUtils.java b/integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/StreamUtils.java
similarity index 100%
rename from integration/deltaspike-data/impl-1.8/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/StreamUtils.java
rename to integration/deltaspike-data/impl-2.0/src/main/java/com/blazebit/persistence/deltaspike/data/impl/util/StreamUtils.java
diff --git a/integration/deltaspike-data/impl-2.0/src/main/java/module-info.java b/integration/deltaspike-data/impl-2.0/src/main/java/module-info.java
new file mode 100644
index 0000000000..a82e9c5459
--- /dev/null
+++ b/integration/deltaspike-data/impl-2.0/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.deltaspike.data.impl {
+	requires transitive com.blazebit.persistence.integration.deltaspike.data;
+	requires deltaspike.partial.bean.module.impl;
+	requires deltaspike.core.api;
+	requires com.blazebit.persistence.integration.deltaspike.data.base;
+	requires deltaspike.jpa.module.api;
+	requires com.blazebit.persistence.view;
+	requires com.blazebit.common.utils;
+	requires jakarta.cdi;
+	requires deltaspike.jpa.module.impl;
+	requires com.blazebit.persistence.core.parser;
+	requires deltaspike.data.module.api;
+	exports com.blazebit.persistence.deltaspike.data.impl;
+	provides jakarta.enterprise.inject.spi.Extension with com.blazebit.persistence.deltaspike.data.impl.CustomPartialBeanBindingExtension;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/apache-deltaspike.properties b/integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/apache-deltaspike.properties
similarity index 100%
rename from integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/apache-deltaspike.properties
rename to integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/apache-deltaspike.properties
diff --git a/integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/beans.xml b/integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from integration/deltaspike-data/impl-1.7/src/main/resources/META-INF/beans.xml
rename to integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/beans.xml
diff --git a/integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
new file mode 100644
index 0000000000..959c48db58
--- /dev/null
+++ b/integration/deltaspike-data/impl-2.0/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -0,0 +1 @@
+com.blazebit.persistence.deltaspike.data.impl.CustomPartialBeanBindingExtension
\ No newline at end of file
diff --git a/integration/deltaspike-data/pom.xml b/integration/deltaspike-data/pom.xml
index dccd299e3c..bd1bbb5f7d 100644
--- a/integration/deltaspike-data/pom.xml
+++ b/integration/deltaspike-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,8 +14,7 @@
     <modules>
         <module>api</module>
         <module>base</module>
-        <module>impl-1.7</module>
-        <module>impl-1.8</module>
+        <module>impl-2.0</module>
         <module>rest</module>
         <module>testsuite</module>
     </modules>
diff --git a/integration/deltaspike-data/rest/api/pom.xml b/integration/deltaspike-data/rest/api/pom.xml
index 537c170f70..ffeaf720e2 100644
--- a/integration/deltaspike-data/rest/api/pom.xml
+++ b/integration/deltaspike-data/rest/api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data-rest</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,38 +17,14 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive java.ws.rs;
-                                        requires transitive com.blazebit.persistence.integration.deltaspike.data;
-                                        exports com.blazebit.persistence.deltaspike.data.rest;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file
diff --git a/integration/deltaspike-data/rest/api/src/main/java/module-info.java b/integration/deltaspike-data/rest/api/src/main/java/module-info.java
new file mode 100644
index 0000000000..1d4ec6a0c9
--- /dev/null
+++ b/integration/deltaspike-data/rest/api/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.deltaspike.data.rest {
+	requires transitive jakarta.ws.rs;
+	requires transitive com.blazebit.persistence.integration.deltaspike.data;
+	exports com.blazebit.persistence.deltaspike.data.rest;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/rest/impl/pom.xml b/integration/deltaspike-data/rest/impl/pom.xml
index ff0da7d733..72a15b1f72 100644
--- a/integration/deltaspike-data/rest/impl/pom.xml
+++ b/integration/deltaspike-data/rest/impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data-rest</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,26 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
@@ -37,81 +57,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.deltaspike.data.rest;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.deltaspike.data.rest.impl;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
-            <id>deltaspike-1.7</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.7}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.8</id>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.deltaspike.distribution</groupId>
-                        <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.8}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>deltaspike-1.9</id>
+            <id>deltaspike-2.0</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -120,7 +76,7 @@
                     <dependency>
                         <groupId>org.apache.deltaspike.distribution</groupId>
                         <artifactId>distributions-bom</artifactId>
-                        <version>${version.deltaspike-1.9}</version>
+                        <version>${version.deltaspike-2.0}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
diff --git a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableConfigurationImpl.java b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableConfigurationImpl.java
index 138faed9f2..3ce4c90a71 100644
--- a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableConfigurationImpl.java
+++ b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableConfigurationImpl.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.deltaspike.data.Pageable;
 import com.blazebit.persistence.deltaspike.data.rest.KeysetPageableConfiguration;
 
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
 
 /**
  *
diff --git a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableMessageBodyReader.java b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableMessageBodyReader.java
index c65d4f1964..2afe81e3ee 100644
--- a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableMessageBodyReader.java
+++ b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableMessageBodyReader.java
@@ -7,12 +7,12 @@
 
 import com.blazebit.persistence.deltaspike.data.Pageable;
 
-import javax.inject.Inject;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.Provider;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
diff --git a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverter.java b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverter.java
index 693dfde1f7..a3acd6908d 100644
--- a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverter.java
+++ b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverter.java
@@ -19,10 +19,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
diff --git a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverterProvider.java b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverterProvider.java
index 2d021b471e..0639b9d556 100644
--- a/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverterProvider.java
+++ b/integration/deltaspike-data/rest/impl/src/main/java/com/blazebit/persistence/deltaspike/data/rest/impl/KeysetPageableParamConverterProvider.java
@@ -16,13 +16,13 @@
 import com.blazebit.persistence.deltaspike.data.rest.SortDefault;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/integration/deltaspike-data/rest/impl/src/main/java/module-info.java b/integration/deltaspike-data/rest/impl/src/main/java/module-info.java
new file mode 100644
index 0000000000..c60e8372f6
--- /dev/null
+++ b/integration/deltaspike-data/rest/impl/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.deltaspike.data.rest.impl {
+	requires transitive com.blazebit.persistence.integration.deltaspike.data.rest;
+	requires com.blazebit.common.utils;
+	requires jakarta.cdi;
+	requires com.blazebit.persistence.core;
+	requires com.fasterxml.jackson.databind;
+	exports com.blazebit.persistence.deltaspike.data.rest.impl;
+}
\ No newline at end of file
diff --git a/integration/deltaspike-data/rest/pom.xml b/integration/deltaspike-data/rest/pom.xml
index a7e9e9d0a8..34a9222a8b 100644
--- a/integration/deltaspike-data/rest/pom.xml
+++ b/integration/deltaspike-data/rest/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/testsuite/pom.xml b/integration/deltaspike-data/testsuite/pom.xml
index 80ec44247b..e354e371f2 100644
--- a/integration/deltaspike-data/testsuite/pom.xml
+++ b/integration/deltaspike-data/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
     <name>Blazebit Persistence Integration DeltaSpike Data Testsuite</name>
     <properties>
         <module.name>com.blazebit.persistence.integration.deltaspike.data.testsuite</module.name>
-        <version.deltaspike>${version.deltaspike-1.9}</version.deltaspike>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
     </properties>
 
     <dependencyManagement>
@@ -30,9 +30,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -79,19 +78,6 @@
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Since we are including a module-info.class file, we need at least 2.0.4.Final -->
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>${version.jandex}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -113,7 +99,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
 
@@ -193,41 +179,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>${surefire.jvm.params}</argLine>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>postgresql</id>
             <build>
@@ -264,41 +215,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>${surefire.jvm.params}</argLine>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>db2</id>
             <build>
@@ -335,41 +251,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>${surefire.jvm.params}</argLine>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>oracle</id>
             <build>
@@ -478,9 +359,9 @@
                                 <version>${project.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-entitymanager</artifactId>
-                                <version>${version.hibernate-4.3}</version>
+                                <groupId>org.hibernate.orm</groupId>
+                                <artifactId>hibernate-core</artifactId>
+                                <version>${version.hibernate-6.6}</version>
                             </dependency>
                             <dependency>
                                 <groupId>com.microsoft.sqlserver</groupId>
@@ -502,2322 +383,385 @@
 
         <!-- JPA provider profiles -->
         <profile>
-            <id>hibernate</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
+                    <version>${version.hibernate-6.2}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-4.3</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.0</id>
+            <id>hibernate-6.6</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>eclipselink</id>
+            <properties>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>eclipselink</artifactId>
+                    <version>${version.eclipselink}</version>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <!-- IntelliJ apparently needs the annotation processor here -->
+                <dependency>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                    <version>${version.eclipselink}</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/main/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>hibernate-apt</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <version>${version.hibernate-apt}</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                    <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TEST-PU</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
 
         <profile>
-            <id>deltaspike-1.7</id>
-            <properties>
-                <version.weld>2.4.5.Final</version.weld>
-                <version.deltaspike>${version.deltaspike-1.7}</version.deltaspike>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>deltaspike-1.8</id>
-            <properties>
-                <version.weld>2.4.5.Final</version.weld>
-                <version.deltaspike>${version.deltaspike-1.8}</version.deltaspike>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>deltaspike-1.9</id>
+            <id>deltaspike-2.0</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.deltaspike>${version.deltaspike-1.9}</version.deltaspike>
+                <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+                    <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java
index 951385472c..c54fa35829 100644
--- a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java
+++ b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Address.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.deltaspike.data.testsuite.entity;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  * @author Moritz Becker
diff --git a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java
index deef66d7dd..e89e10f79d 100644
--- a/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java
+++ b/integration/deltaspike-data/testsuite/src/main/java/com/blazebit/persistence/deltaspike/data/testsuite/entity/Person.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.deltaspike.data.testsuite.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
index 4cc68f2309..1f63d54ec9 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/AbstractEntityViewRepositoryTest.java
@@ -19,8 +19,8 @@
 import org.junit.After;
 import org.junit.Before;
 
-import javax.inject.Inject;
-import javax.persistence.EntityTransaction;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityTransaction;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java
index 5a844eab90..7b86a2a9d1 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/CriteriaSupportTest.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.deltaspike.data.testsuite.view.PersonView;
 import org.junit.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
index ccb38e6386..e1ed996551 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/ExtendedEntityViewRepositoryTest.java
@@ -12,7 +12,7 @@
 import org.apache.deltaspike.data.api.QueryResult;
 import org.junit.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java
index bbef869125..c07538266b 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/FullEntityViewRepositoryTest.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/RestrictedPersonViewRepositoryTest.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/RestrictedPersonViewRepositoryTest.java
index 971696d24d..ba2f3ebd4d 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/RestrictedPersonViewRepositoryTest.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/RestrictedPersonViewRepositoryTest.java
@@ -11,7 +11,7 @@
 import com.blazebit.persistence.deltaspike.data.testsuite.repository.RestrictedPersonViewRepository;
 import org.junit.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java
index 87a2a4b0d3..2dcac3b145 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/BlazePersistenceProducer.java
@@ -16,10 +16,10 @@
 import com.blazebit.persistence.view.EntityViews;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
index 2f4a74b387..9ce80f6358 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/producer/EntityManagerProducer.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.deltaspike.data.testsuite.producer;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/qualifier/Restricted.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/qualifier/Restricted.java
index 0fe7470349..264f516cce 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/qualifier/Restricted.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/qualifier/Restricted.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.deltaspike.data.testsuite.qualifier;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/resolver/RestrictedEntityViewManagerResolver.java b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/resolver/RestrictedEntityViewManagerResolver.java
index c0ba758fcb..f79fbdca89 100644
--- a/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/resolver/RestrictedEntityViewManagerResolver.java
+++ b/integration/deltaspike-data/testsuite/src/test/java/com/blazebit/persistence/deltaspike/data/testsuite/resolver/RestrictedEntityViewManagerResolver.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.deltaspike.data.testsuite.qualifier.Restricted;
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Moritz Becker
diff --git a/integration/eclipselink/pom.xml b/integration/eclipselink/pom.xml
index 6baf72b418..1a0c0ebdf4 100644
--- a/integration/eclipselink/pom.xml
+++ b/integration/eclipselink/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,12 +39,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-jpa-base</artifactId>
@@ -57,76 +51,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.eclipse.persistence.jpa;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.eclipselink.function.EclipseLinkEntityManagerIntegrator;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/EclipseLinkJpaProvider.java b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/EclipseLinkJpaProvider.java
index d1c89fe765..cf15438598 100644
--- a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/EclipseLinkJpaProvider.java
+++ b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/EclipseLinkJpaProvider.java
@@ -13,9 +13,6 @@
 import com.blazebit.reflection.ReflectionUtils;
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.internal.helper.DatabaseField;
-import org.eclipse.persistence.internal.jpa.metamodel.AttributeImpl;
-import org.eclipse.persistence.internal.jpa.metamodel.ManagedTypeImpl;
-import org.eclipse.persistence.internal.jpa.metamodel.PluralAttributeImpl;
 import org.eclipse.persistence.jpa.JpaEntityManager;
 import org.eclipse.persistence.mappings.AggregateCollectionMapping;
 import org.eclipse.persistence.mappings.CollectionMapping;
@@ -26,15 +23,15 @@
 import org.eclipse.persistence.mappings.ManyToManyMapping;
 import org.eclipse.persistence.mappings.OneToOneMapping;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -52,6 +49,7 @@ public class EclipseLinkJpaProvider implements JpaProvider {
 
     private static final String[] EMPTY = {};
     private final PersistenceUnitUtil persistenceUnitUtil;
+    private final Map<Class<?>, ClassDescriptor> descriptors;
     private final DB db;
 
     /**
@@ -63,13 +61,14 @@ private static enum DB {
         DB2;
     }
 
-    public EclipseLinkJpaProvider(PersistenceUnitUtil persistenceUnitUtil, String dbms) {
+    public EclipseLinkJpaProvider(PersistenceUnitUtil persistenceUnitUtil, String dbms, Map<Class<?>, ClassDescriptor> descriptors) {
         this.persistenceUnitUtil = persistenceUnitUtil;
         if ("db2".equals(dbms)) {
             this.db = DB.DB2;
         } else {
             this.db = DB.OTHER;
         }
+        this.descriptors = descriptors;
     }
 
     @Override
@@ -284,9 +283,8 @@ public String[] getDiscriminatorColumnCheck(EntityType<?> entityType) {
 
     @Override
     public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
-        ManagedTypeImpl<?> managedType = (ManagedTypeImpl<?>) ownerType;
         String[] parts = attributeName.split("\\.");
-        DatabaseMapping mapping = managedType.getDescriptor().getMappingForAttributeName(parts[0]);
+        DatabaseMapping mapping = getDescriptor(ownerType).getMappingForAttributeName(parts[0]);
         for (int i = 1; i < parts.length; i++) {
             mapping = mapping.getReferenceDescriptor().getMappingForAttributeName(parts[i]);
         }
@@ -308,7 +306,7 @@ public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attrib
 
     @Override
     public String getMappedBy(EntityType<?> ownerType, String attributeName) {
-        DatabaseMapping mapping = getAttribute(ownerType, attributeName).getMapping();
+        DatabaseMapping mapping = getDatabaseMapping(ownerType, attributeName);
         if (mapping instanceof CollectionMapping) {
             return ((CollectionMapping) mapping).getMappedBy();
         }
@@ -343,7 +341,7 @@ public String[] getColumnTypes(EntityType<?> ownerType, String elementCollection
 
     @Override
     public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
-        DatabaseMapping mapping = getAttribute(ownerType, attributeName).getMapping();
+        DatabaseMapping mapping = getDatabaseMapping(ownerType, attributeName);
         if (mapping instanceof OneToOneMapping) {
             OneToOneMapping oneToOneMapping = (OneToOneMapping) mapping;
             if (oneToOneMapping.hasRelationTable()) {
@@ -471,13 +469,13 @@ private static Map<String, String> keyMapping(List<DatabaseField> identityFields
 
     @Override
     public boolean isBag(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        Attribute<?, ?> attribute = getAttribute(ownerType, attributeName);
         if (attribute instanceof PluralAttribute) {
             PluralAttribute<?, ?, ?> pluralAttr = (PluralAttribute<?, ?, ?>) attribute;
             if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.COLLECTION) {
                 return true;
             } else if (pluralAttr.getCollectionType() == PluralAttribute.CollectionType.LIST) {
-                DatabaseMapping mapping = attribute.getMapping();
+                DatabaseMapping mapping = getDatabaseMapping(ownerType, attributeName);
                 if (mapping instanceof CollectionMapping) {
                     CollectionMapping collectionMapping = (CollectionMapping) mapping;
                     return collectionMapping.getListOrderField() == null;
@@ -489,9 +487,9 @@ public boolean isBag(EntityType<?> ownerType, String attributeName) {
 
     @Override
     public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute != null && attribute.getMapping() instanceof ForeignReferenceMapping) {
-            ForeignReferenceMapping mapping = (ForeignReferenceMapping) attribute.getMapping();
+        DatabaseMapping attribute = getDatabaseMapping(ownerType, attributeName);
+        if (attribute instanceof ForeignReferenceMapping) {
+            ForeignReferenceMapping mapping = (ForeignReferenceMapping) attribute;
             return mapping.isPrivateOwned() && mapping.isCascadeRemove();
         }
         return false;
@@ -505,9 +503,9 @@ public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectio
 
     @Override
     public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (attribute != null && attribute.getMapping() instanceof ForeignReferenceMapping) {
-            ForeignReferenceMapping mapping = (ForeignReferenceMapping) attribute.getMapping();
+        DatabaseMapping attribute = getDatabaseMapping(ownerType, attributeName);
+        if (attribute instanceof ForeignReferenceMapping) {
+            ForeignReferenceMapping mapping = (ForeignReferenceMapping) attribute;
             return mapping.isCascadeRemove();
         }
         return false;
@@ -529,9 +527,46 @@ public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id)
         return em.unwrap(JpaEntityManager.class).getActiveSession().getIdentityMapAccessor().getFromIdentityMap(id, entityClass) != null;
     }
 
-    private AttributeImpl<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
+    private ClassDescriptor getDescriptor(ManagedType<?> type) {
+        return descriptors.get( type.getJavaType() );
+    }
+
+    private DatabaseMapping getDatabaseMapping(ManagedType<?> type, String attributeName) {
+        ClassDescriptor t = descriptors.get( type.getJavaType() );
+        if (t == null) {
+            return null;
+        }
+        if (attributeName.indexOf('.') == -1) {
+            return descriptors.get( type.getJavaType() ).getMappingForAttributeName( attributeName );
+        }
+        DatabaseMapping attr = null;
+        String[] parts = attributeName.split("\\.");
+        for (int i = 0; i < parts.length; i++) {
+            DatabaseMapping attribute = t.getMappingForAttributeName(parts[i]);
+            if (attribute == null) {
+                throw new IllegalArgumentException("Illegal attribute name for type [" + type.getJavaType().getName() + "]: " + attributeName);
+            }
+            if (attribute instanceof CollectionMapping) {
+                // Skip id attribute accesses
+                if (i + 1 != parts.length) {
+                    return null;
+                } else {
+                    return attribute;
+                }
+            }
+            attr = attribute;
+            t = attribute.getReferenceDescriptor();
+            if (t == null && attribute instanceof ForeignReferenceMapping) {
+                t = descriptors.get( ( (ForeignReferenceMapping) attribute).getReferenceClass() );
+            }
+        }
+
+        return attr;
+    }
+
+    private Attribute<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
         if (attributeName.indexOf('.') == -1) {
-            return (AttributeImpl<?, ?>) ownerType.getAttribute(attributeName);
+            return ownerType.getAttribute(attributeName);
         }
         ManagedType<?> t = ownerType;
         SingularAttribute<?, ?> attr = null;
@@ -543,7 +578,7 @@ public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id)
                 if (i + 1 != parts.length) {
                     return null;
                 } else {
-                    return (AttributeImpl<?, ?>) attribute;
+                    return attribute;
                 }
             }
             attr = (SingularAttribute<?, ?>) attribute;
@@ -554,7 +589,7 @@ public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id)
             }
         }
 
-        return (AttributeImpl<?, ?>) attr;
+        return attr;
     }
 
     @Override
@@ -583,11 +618,6 @@ public boolean supportsTransientEntityAsParameter() {
         return true;
     }
 
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
     @Override
     public boolean needsBrokenAssociationToIdRewriteInOnClause() {
         return false;
@@ -655,7 +685,7 @@ public void setSingularParameter(Query query, String name, Object value) {
 
     @Override
     public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String attributeName) {
-        AttributeImpl<?, ?> attribute = getAttribute(ownerType, attributeName);
+        Attribute<?, ?> attribute = getAttribute(ownerType, attributeName);
         if (attribute instanceof SingularAttribute<?, ?> && ((SingularAttribute<?, ?>) attribute).getType() instanceof EntityType<?>) {
             EntityType<?> entityType = (EntityType<?>) ((SingularAttribute<?, ?>) attribute).getType();
             if (entityType.hasSingleIdAttribute()) {
@@ -693,7 +723,7 @@ public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?>
 
     @Override
     public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        ClassDescriptor referenceDescriptor = ((PluralAttributeImpl) getAttribute(ownerType, elementCollectionPath)).getCollectionMapping().getReferenceDescriptor();
+        ClassDescriptor referenceDescriptor = getDatabaseMapping(ownerType, elementCollectionPath).getReferenceDescriptor();
         Vector<DatabaseMapping> mappings = referenceDescriptor.getMappings();
         String path = attributeName.substring(elementCollectionPath.length() + 1);
         String[] parts = path.split("\\.");
diff --git a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/EclipseLinkEntityManagerIntegrator.java b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/EclipseLinkEntityManagerIntegrator.java
index 310f99e969..596422f87f 100644
--- a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/EclipseLinkEntityManagerIntegrator.java
+++ b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/EclipseLinkEntityManagerIntegrator.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.eclipselink.function;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.integration.eclipselink.EclipseLinkJpaProvider;
 import com.blazebit.persistence.integration.jpa.function.CountStarFunction;
 import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
@@ -13,6 +12,7 @@
 import com.blazebit.persistence.spi.JpaProviderFactory;
 import com.blazebit.persistence.spi.JpqlFunction;
 import com.blazebit.persistence.spi.JpqlFunctionGroup;
+import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.expressions.ExpressionOperator;
 import org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
 import org.eclipse.persistence.internal.helper.ClassConstants;
@@ -20,11 +20,12 @@
 import org.eclipse.persistence.jpa.JpaEntityManagerFactory;
 import org.eclipse.persistence.platform.database.DatabasePlatform;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceUnitUtil;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.PersistenceUnitUtil;
 import java.sql.Connection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -34,7 +35,6 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
 public class EclipseLinkEntityManagerIntegrator implements EntityManagerFactoryIntegrator {
     
     private static final Logger LOG = Logger.getLogger(EntityManagerFactoryIntegrator.class.getName());
@@ -130,11 +130,10 @@ public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entit
         return new JpaProviderFactory() {
             @Override
             public JpaProvider createJpaProvider(EntityManager em) {
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                return new EclipseLinkJpaProvider(persistenceUnitUtil, getDbms(entityManagerFactory));
+                EntityManagerFactory emf = entityManagerFactory == null || em == null ? entityManagerFactory : em.getEntityManagerFactory();
+                PersistenceUnitUtil persistenceUnitUtil = emf == null ? null : emf.getPersistenceUnitUtil();
+                Map<Class<?>, ClassDescriptor> classDescriptors = emf == null ? Collections.emptyMap() : emf.unwrap(JpaEntityManagerFactory.class).getDatabaseSession().getDescriptors();
+                return new EclipseLinkJpaProvider(persistenceUnitUtil, getDbms(entityManagerFactory), classDescriptors);
             }
         };
     }
@@ -254,10 +253,10 @@ public EntityManagerFactory registerFunctions(EntityManagerFactory entityManager
     }
 
     private Map<Class<?>, String> getClassToTypeMap(DatabasePlatform platform) {
-        Map<Class, FieldTypeDefinition> fieldTypes = platform.getFieldTypes();
+        Map<Class<?>, FieldTypeDefinition> fieldTypes = platform.getFieldTypes();
         Map<Class<?>, String> classToTypesMap = new HashMap<>();
         StringBuilder sb = new StringBuilder();
-        for (Map.Entry<Class, FieldTypeDefinition> entry : fieldTypes.entrySet()) {
+        for (Map.Entry<Class<?>, FieldTypeDefinition> entry : fieldTypes.entrySet()) {
             FieldTypeDefinition fieldTypeDefinition = entry.getValue();
             sb.setLength(0);
             sb.append(fieldTypeDefinition.getName());
diff --git a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/JpqlFunctionExpressionOperator.java b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/JpqlFunctionExpressionOperator.java
index 0af6f9a51d..b7efe99753 100644
--- a/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/JpqlFunctionExpressionOperator.java
+++ b/integration/eclipselink/src/main/java/com/blazebit/persistence/integration/eclipselink/function/JpqlFunctionExpressionOperator.java
@@ -76,8 +76,8 @@ public void printDuo(Expression first, Expression second, ExpressionSQLPrinter p
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public void printCollection(Vector items, ExpressionSQLPrinter printer) {
-        prepare((List<Expression>) items, printer);
+    public void printCollection(List<Expression> items, ExpressionSQLPrinter printer) {
+        prepare(items, printer);
         // Certain functions don't allow binding on some platforms.
         if (printer.getPlatform().isDynamicSQLRequiredForFunctions() && !isBindingSupported()) {
             printer.getCall().setUsesBinding(false);
@@ -105,7 +105,7 @@ public void printCollection(Vector items, ExpressionSQLPrinter printer) {
             int index = argumentIndices[i];
             Expression item;
             if (index == -1) {
-                item = (Expression)items.elementAt(i);
+                item = items.get(i);
                 Writer w = printer.getWriter();
                 try {
                     printer.setWriter(NULL_WRITER);
@@ -115,7 +115,7 @@ public void printCollection(Vector items, ExpressionSQLPrinter printer) {
                 }
                 continue;
             }
-            item = (Expression)items.elementAt(index);
+            item = items.get(index);
             if ((this.selector == Ref) || ((this.selector == Deref) && (item.isObjectExpression()))) {
                 DatabaseTable alias = ((ObjectExpression)item).aliasForTable(((ObjectExpression)item).getDescriptor().getTables().firstElement());
                 printer.printString(alias.getNameDelimited(printer.getPlatform()));
diff --git a/integration/eclipselink/src/main/java/module-info.java b/integration/eclipselink/src/main/java/module-info.java
new file mode 100644
index 0000000000..c2321696ff
--- /dev/null
+++ b/integration/eclipselink/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.eclipselink {
+	requires eclipselink;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.integration.jpa;
+	requires com.blazebit.persistence.core;
+	provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.eclipselink.function.EclipseLinkEntityManagerIntegrator;
+}
\ No newline at end of file
diff --git a/integration/eclipselink/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator b/integration/eclipselink/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator
new file mode 100644
index 0000000000..528c9261d8
--- /dev/null
+++ b/integration/eclipselink/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.eclipselink.function.EclipseLinkEntityManagerIntegrator
diff --git a/integration/entity-view-cdi-jakarta/pom.xml b/integration/entity-view-cdi-jakarta/pom.xml
deleted file mode 100644
index ea6016f23d..0000000000
--- a/integration/entity-view-cdi-jakarta/pom.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-entity-view-cdi-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.view.cdi</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jakarta-jaxb-api}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-entity-view-cdi:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-entity-view-cdi:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-entity-view-cdi:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/entity-view-cdi-jar/pom.xml b/integration/entity-view-cdi-jar/pom.xml
deleted file mode 100644
index 59a0e0f6f2..0000000000
--- a/integration/entity-view-cdi-jar/pom.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-entity-view-cdi-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.view.cdi</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-integration-entity-view-cdi</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/entity-view-cdi/pom.xml b/integration/entity-view-cdi/pom.xml
index 62a8c3538e..4857aa0c66 100644
--- a/integration/entity-view-cdi/pom.xml
+++ b/integration/entity-view-cdi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
     <packaging>jar</packaging>
@@ -17,6 +17,7 @@
     <name>Blazebit Persistence Integration Entity-View CDI</name>
 
     <properties>
+        <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
         <module.name>com.blazebit.persistence.integration.view.cdi</module.name>
     </properties>
 
@@ -25,7 +26,7 @@
             <dependency>
                 <groupId>org.apache.deltaspike.distribution</groupId>
                 <artifactId>distributions-bom</artifactId>
-                <version>${version.deltaspike-1.9}</version>
+                <version>${version.deltaspike-2.0}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -41,13 +42,7 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,12 +53,6 @@
             <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
@@ -125,93 +114,21 @@
         <dependency>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jta}</version>
+            <version>${version.jta-api}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <!-- This must be an open module because CDI needs to introspect the extension -->
-                                <moduleInfoSource>
-                                    open module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires jakarta.enterprise.cdi.api;
-                                        requires com.blazebit.persistence.view;
-                                        exports com.blazebit.persistence.integration.view.cdi;
-                                        provides javax.enterprise.inject.spi.Extension with com.blazebit.persistence.integration.view.cdi.EntityViewExtension;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- No idea why, but the Jakarta EL API is not picked up by the class loader -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>post-10-unsafe-code</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/CustomBean.java b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/CustomBean.java
index b515fdafc6..2f858b468d 100644
--- a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/CustomBean.java
+++ b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/CustomBean.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.integration.view.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Arrays;
@@ -66,11 +66,6 @@ public String getName() {
         return null;
     }
 
-    @Override
-    public boolean isNullable() {
-        return false;
-    }
-
     @Override
     public Set<InjectionPoint> getInjectionPoints() {
         return Collections.emptySet();
diff --git a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/DefaultLiteral.java b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/DefaultLiteral.java
index 2efafd87e7..deb5786f30 100644
--- a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/DefaultLiteral.java
+++ b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/DefaultLiteral.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.integration.view.cdi;
 
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 /**
  * Literal for {@link Default}
diff --git a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtension.java b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtension.java
index b6b8ed6b63..c93fe46d6a 100644
--- a/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtension.java
+++ b/integration/entity-view-cdi/src/main/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtension.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.view.cdi;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.EntityViewListener;
 import com.blazebit.persistence.view.EntityViewListeners;
@@ -14,14 +13,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.WithAnnotations;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.WithAnnotations;
 import java.lang.annotation.Annotation;
 
 /**
@@ -29,7 +28,6 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-@ServiceProvider(Extension.class)
 public class EntityViewExtension implements Extension {
 
     private final EntityViewConfiguration configuration = EntityViews.createDefaultConfiguration();
diff --git a/integration/entity-view-cdi/src/main/java/module-info.java b/integration/entity-view-cdi/src/main/java/module-info.java
new file mode 100644
index 0000000000..5df0c25139
--- /dev/null
+++ b/integration/entity-view-cdi/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.view.cdi {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires jakarta.cdi;
+	requires com.blazebit.persistence.view;
+	exports com.blazebit.persistence.integration.view.cdi;
+	provides jakarta.enterprise.inject.spi.Extension with com.blazebit.persistence.integration.view.cdi.EntityViewExtension;
+}
\ No newline at end of file
diff --git a/integration/entity-view-cdi/src/main/resources/META-INF/beans.xml b/integration/entity-view-cdi/src/main/resources/META-INF/beans.xml
index a960ac8b67..7e5bf0fab0 100644
--- a/integration/entity-view-cdi/src/main/resources/META-INF/beans.xml
+++ b/integration/entity-view-cdi/src/main/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/integration/entity-view-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/integration/entity-view-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
new file mode 100644
index 0000000000..a4a91fabf4
--- /dev/null
+++ b/integration/entity-view-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.view.cdi.EntityViewExtension
diff --git a/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtensionTest.java b/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtensionTest.java
index 604e203bbd..27e28ee922 100644
--- a/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtensionTest.java
+++ b/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/EntityViewExtensionTest.java
@@ -11,7 +11,7 @@
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 import org.junit.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static org.junit.Assert.*;
 
@@ -25,6 +25,8 @@ public class EntityViewExtensionTest {
     @Inject
     private EntityViewConfiguration config;
 
+    // NOTE: IntelliJ can't run this test correctly, because it doesn't interpret the
+    // <useModulePath>false</useModulePath> setting in the pom.xml correctly
     @Test
     public void testInjection() throws Exception {
         CdiContainer container = CdiContainerLoader.getCdiContainer();
diff --git a/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/TestEntity.java b/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/TestEntity.java
index 8560d784cb..59b87cb7e6 100644
--- a/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/TestEntity.java
+++ b/integration/entity-view-cdi/src/test/java/com/blazebit/persistence/integration/view/cdi/TestEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.integration.view.cdi;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**
diff --git a/integration/entity-view-cdi/src/test/resources/META-INF/beans.xml b/integration/entity-view-cdi/src/test/resources/META-INF/beans.xml
index a960ac8b67..ceb1bf8eaf 100644
--- a/integration/entity-view-cdi/src/test/resources/META-INF/beans.xml
+++ b/integration/entity-view-cdi/src/test/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
 </beans>
diff --git a/integration/entity-view-spring-6.0/pom.xml b/integration/entity-view-spring-6.0/pom.xml
index 245b134cf6..2ff7d1646c 100644
--- a/integration/entity-view-spring-6.0/pom.xml
+++ b/integration/entity-view-spring-6.0/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -55,13 +55,21 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jakarta-jta}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -69,13 +77,12 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <version>2.0.1</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -90,39 +97,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires spring.core;
-                                        requires spring.beans;
-                                        requires spring.context;
-                                        requires com.blazebit.persistence.view;
-                                        exports com.blazebit.persistence.integration.view.spring;
-                                        exports com.blazebit.persistence.integration.view.spring.impl to spring.beans;
-                                        opens com.blazebit.persistence.integration.view.spring.impl to spring.core, spring.context;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.view.spring.impl.SpringTransactionAccessFactory;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/integration/entity-view-spring-6.0/src/main/java/module-info.java b/integration/entity-view-spring-6.0/src/main/java/module-info.java
new file mode 100644
index 0000000000..1253cfc089
--- /dev/null
+++ b/integration/entity-view-spring-6.0/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.view.spring {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires spring.core;
+	requires spring.beans;
+	requires spring.context;
+	requires com.blazebit.persistence.view;
+	requires spring.tx;
+	requires jakarta.transaction;
+	exports com.blazebit.persistence.integration.view.spring;
+	exports com.blazebit.persistence.integration.view.spring.impl to spring.beans;
+	opens com.blazebit.persistence.integration.view.spring.impl to spring.core, spring.context;
+	// This also opens up the XSD file
+	opens com.blazebit.persistence.integration.view.spring;
+	provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.view.spring.impl.SpringTransactionAccessFactory;
+}
\ No newline at end of file
diff --git a/integration/entity-view-spring/pom.xml b/integration/entity-view-spring/pom.xml
deleted file mode 100644
index aab50b5149..0000000000
--- a/integration/entity-view-spring/pom.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Entity-View Spring</name>
-    <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.view.spring</module.name>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jta}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires spring.core;
-                                        requires spring.beans;
-                                        requires spring.context;
-                                        requires com.blazebit.persistence.view;
-                                        exports com.blazebit.persistence.integration.view.spring;
-                                        exports com.blazebit.persistence.integration.view.spring.impl to spring.beans;
-                                        opens com.blazebit.persistence.integration.view.spring.impl to spring.core, spring.context;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.view.spring.impl.SpringTransactionAccessFactory;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/EnableEntityViews.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/EnableEntityViews.java
deleted file mode 100644
index 97f34c19b3..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/EnableEntityViews.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.impl.EntityViewRegistrar;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AliasFor;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to enable entity view scanning. By enabling scanning, a bean for {@link com.blazebit.persistence.view.spi.EntityViewConfiguration} is made available.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Documented
-@Import(EntityViewRegistrar.class)
-public @interface EnableEntityViews {
-    /**
-     * Alias for {@link #basePackages}.
-     * <p>Allows for more concise annotation declarations if no other attributes
-     * are needed &mdash; for example, {@code @ComponentScan("org.my.pkg")}
-     * instead of {@code @ComponentScan(basePackages = "org.my.pkg")}.
-     */
-    @AliasFor("basePackages")
-    String[] value() default {};
-
-    /**
-     * Base packages to scan for annotated components.
-     * <p>{@link #value} is an alias for (and mutually exclusive with) this
-     * attribute.
-     * <p>Use {@link #basePackageClasses} for a type-safe alternative to
-     * String-based package names.
-     */
-    @AliasFor("value")
-    String[] basePackages() default {};
-
-    /**
-     * Type-safe alternative to {@link #basePackages} for specifying the packages
-     * to scan for annotated components. The package of each class specified will be scanned.
-     * <p>Consider creating a special no-op marker class or interface in each package
-     * that serves no purpose other than being referenced by this attribute.
-     */
-    Class<?>[] basePackageClasses() default {};
-
-    /**
-     * Specifies which types are eligible for component scanning. Further narrows the set of candidate components from
-     * everything in {@link #basePackages()} to everything in the base packages that matches the given filter or filters.
-     */
-    ComponentScan.Filter[] includeFilters() default {};
-
-    /**
-     * Specifies which types are not eligible for component scanning.
-     */
-    ComponentScan.Filter[] excludeFilters() default {};
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AbstractEntityViewConfigurationSource.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AbstractEntityViewConfigurationSource.java
deleted file mode 100644
index b42a58b5eb..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AbstractEntityViewConfigurationSource.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.filter.TypeFilter;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public abstract class AbstractEntityViewConfigurationSource {
-
-    private final Environment environment;
-
-    public AbstractEntityViewConfigurationSource(Environment environment) {
-        this.environment = environment;
-    }
-
-    public abstract Iterable<String> getBasePackages();
-
-    protected abstract Iterable<TypeFilter> getExcludeFilters();
-
-    protected abstract Iterable<TypeFilter> getIncludeFilters();
-
-    public Collection<BeanDefinition> getCandidates(ResourceLoader resourceLoader) {
-        EntityViewComponentProvider scanner = new EntityViewComponentProvider(getIncludeFilters());
-//        scanner.setConsiderNestedRepositoryInterfaces(shouldConsiderNestedRepositories());
-        scanner.setResourceLoader(resourceLoader);
-        scanner.setEnvironment(environment);
-
-        for (TypeFilter filter : getExcludeFilters()) {
-            scanner.addExcludeFilter(filter);
-        }
-
-        Set<BeanDefinition> result = new HashSet<BeanDefinition>();
-
-        for (String basePackage : getBasePackages()) {
-            Set<BeanDefinition> candidate = scanner.findCandidateComponents(basePackage);
-            result.addAll(candidate);
-        }
-
-        return result;
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java
deleted file mode 100644
index d8fe67478a..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.AspectJTypeFilter;
-import org.springframework.core.type.filter.AssignableTypeFilter;
-import org.springframework.core.type.filter.RegexPatternTypeFilter;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class AnnotationEntityViewConfigurationSource extends AbstractEntityViewConfigurationSource {
-
-    private static final String BASE_PACKAGES = "basePackages";
-    private static final String BASE_PACKAGE_CLASSES = "basePackageClasses";
-
-    private final AnnotationMetadata configMetadata;
-    private final AnnotationAttributes attributes;
-    private final ResourceLoader resourceLoader;
-
-    public AnnotationEntityViewConfigurationSource(AnnotationMetadata metadata, Class<? extends Annotation> annotation,
-                                                   ResourceLoader resourceLoader, Environment environment) {
-        super(environment);
-        Assert.notNull(metadata);
-        Assert.notNull(annotation);
-        Assert.notNull(resourceLoader);
-
-        this.attributes = new AnnotationAttributes(metadata.getAnnotationAttributes(annotation.getName()));
-        this.configMetadata = metadata;
-        this.resourceLoader = resourceLoader;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBasePackages()
-     */
-    @Override
-    public Iterable<String> getBasePackages() {
-
-        String[] value = attributes.getStringArray("value");
-        String[] basePackages = attributes.getStringArray(BASE_PACKAGES);
-        Class<?>[] basePackageClasses = attributes.getClassArray(BASE_PACKAGE_CLASSES);
-
-        // Default configuration - return package of annotated class
-        if (value.length == 0 && basePackages.length == 0 && basePackageClasses.length == 0) {
-            String className = configMetadata.getClassName();
-            return Collections.singleton(ClassUtils.getPackageName(className));
-        }
-
-        Set<String> packages = new HashSet<String>();
-        packages.addAll(Arrays.asList(value));
-        packages.addAll(Arrays.asList(basePackages));
-
-        for (Class<?> typeName : basePackageClasses) {
-            packages.add(ClassUtils.getPackageName(typeName));
-        }
-
-        return packages;
-    }
-
-    protected Iterable<TypeFilter> getIncludeFilters() {
-        return parseFilters("includeFilters");
-    }
-
-    protected Iterable<TypeFilter> getExcludeFilters() {
-        return parseFilters("excludeFilters");
-    }
-
-    private Set<TypeFilter> parseFilters(String attributeName) {
-        Set<TypeFilter> result = new HashSet<>();
-        AnnotationAttributes[] filters = attributes.getAnnotationArray(attributeName);
-
-        for (AnnotationAttributes filter : filters) {
-            result.addAll(typeFiltersFor(filter));
-        }
-
-        return result;
-    }
-
-    /**
-     * Copy of {@code ComponentScanAnnotationParser#typeFiltersFor}.
-     *
-     * @param filterAttributes
-     * @return
-     */
-    private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
-
-        List<TypeFilter> typeFilters = new ArrayList<TypeFilter>();
-        FilterType filterType = filterAttributes.getEnum("type");
-
-        for (Class<?> filterClass : filterAttributes.getClassArray("value")) {
-            switch (filterType) {
-                case ANNOTATION:
-                    Assert.isAssignable(Annotation.class, filterClass, "An error occured when processing a @ComponentScan "
-                            + "ANNOTATION type filter: ");
-                    @SuppressWarnings("unchecked")
-                    Class<Annotation> annoClass = (Class<Annotation>) filterClass;
-                    typeFilters.add(new AnnotationTypeFilter(annoClass));
-                    break;
-                case ASSIGNABLE_TYPE:
-                    typeFilters.add(new AssignableTypeFilter(filterClass));
-                    break;
-                case CUSTOM:
-                    Assert.isAssignable(TypeFilter.class, filterClass, "An error occured when processing a @ComponentScan "
-                            + "CUSTOM type filter: ");
-                    typeFilters.add(BeanUtils.instantiateClass(filterClass, TypeFilter.class));
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unknown filter type " + filterType);
-            }
-        }
-
-        for (String expression : getPatterns(filterAttributes)) {
-
-            String rawName = filterType.toString();
-
-            if ("REGEX".equals(rawName)) {
-                typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
-            } else if ("ASPECTJ".equals(rawName)) {
-                typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader()));
-            } else {
-                throw new IllegalArgumentException("Unknown filter type " + filterType);
-            }
-        }
-
-        return typeFilters;
-    }
-
-    /**
-     * Safely reads the {@code pattern} attribute from the given {@link AnnotationAttributes} and returns an empty list if
-     * the attribute is not present.
-     *
-     * @param filterAttributes must not be {@literal null}.
-     * @return
-     */
-    private String[] getPatterns(AnnotationAttributes filterAttributes) {
-
-        try {
-            return filterAttributes.getStringArray("pattern");
-        } catch (IllegalArgumentException o_O) {
-            return new String[0];
-        }
-    }
-
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewComponentProvider.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewComponentProvider.java
deleted file mode 100644
index 2efa27aab7..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewComponentProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.EntityViewListener;
-import com.blazebit.persistence.view.EntityViewListeners;
-import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-
-import java.io.IOException;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewComponentProvider extends ClassPathScanningCandidateComponentProvider {
-
-    public EntityViewComponentProvider(Iterable<? extends TypeFilter> includeFilters) {
-        super(false);
-
-        Assert.notNull(includeFilters);
-
-        if (includeFilters.iterator().hasNext()) {
-            for (TypeFilter filter : includeFilters) {
-                addIncludeFilter(filter);
-            }
-        } else {
-            super.addIncludeFilter(new AnnotationTypeFilter(EntityView.class, false, false));
-            super.addIncludeFilter(new AnnotationTypeFilter(EntityViewListener.class, false, false));
-            super.addIncludeFilter(new AnnotationTypeFilter(EntityViewListeners.class, false, false));
-        }
-        super.addExcludeFilter(new TypeFilter() {
-            @Override
-            public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
-                return !metadataReader.getAnnotationMetadata().hasAnnotation(EntityView.class.getName())
-                        && !metadataReader.getAnnotationMetadata().hasAnnotation(EntityViewListener.class.getName())
-                        && !metadataReader.getAnnotationMetadata().hasAnnotation(EntityViewListeners.class.getName());
-            }
-        });
-    }
-
-    @Override
-    protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
-        return beanDefinition.getMetadata().isIndependent();
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationDelegate.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationDelegate.java
deleted file mode 100644
index e7d473c9cf..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationDelegate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.EntityView;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.ClassUtils;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewConfigurationDelegate {
-
-    private final AbstractEntityViewConfigurationSource configurationSource;
-    private final ResourceLoader resourceLoader;
-    private final Environment environment;
-
-    public EntityViewConfigurationDelegate(AbstractEntityViewConfigurationSource configurationSource, ResourceLoader resourceLoader, Environment environment) {
-        this.configurationSource = configurationSource;
-        this.resourceLoader = resourceLoader;
-        this.environment = environment;
-    }
-
-    @SuppressWarnings("unchecked")
-    void registerEntityViews(BeanDefinitionRegistry registry) {
-        Set<Class<?>> entityViewClasses = new HashSet<>();
-        Set<Class<?>> entityViewListenerClasses = new HashSet<>();
-        for (BeanDefinition candidate : configurationSource.getCandidates(resourceLoader)) {
-            try {
-                Class<?> clazz = ClassUtils.forName( candidate.getBeanClassName(),  resourceLoader == null ? null : resourceLoader.getClassLoader() );
-                if (clazz.isAnnotationPresent(EntityView.class)) {
-                    entityViewClasses.add(clazz);
-                } else {
-                    entityViewListenerClasses.add(clazz);
-                }
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        final String entityViewClassHolderBeanName = "entityViewConfigurationProducer";
-        if (registry.containsBeanDefinition(entityViewClassHolderBeanName)) {
-            BeanDefinition existingClassHolder = registry.getBeanDefinition(entityViewClassHolderBeanName);
-            Set<Class<?>> existingEntityViewClasses = (Set<Class<?>>) ((GenericBeanDefinition) existingClassHolder).getConstructorArgumentValues().getGenericArgumentValues().get(0).getValue();
-            Set<Class<?>> existingEntityViewListenerClasses = (Set<Class<?>>) ((GenericBeanDefinition) existingClassHolder).getConstructorArgumentValues().getGenericArgumentValues().get(1).getValue();
-            existingEntityViewClasses.addAll(entityViewClasses);
-            existingEntityViewListenerClasses.addAll(entityViewListenerClasses);
-        } else {
-            // register configuration class
-            GenericBeanDefinition beanDefinition = new GenericBeanDefinition();
-            beanDefinition.setBeanClass(EntityViewConfigurationProducer.class);
-            beanDefinition.getConstructorArgumentValues().addGenericArgumentValue(entityViewClasses);
-            beanDefinition.getConstructorArgumentValues().addGenericArgumentValue(entityViewListenerClasses);
-            registry.registerBeanDefinition(entityViewClassHolderBeanName, beanDefinition);
-        }
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationProducer.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationProducer.java
deleted file mode 100644
index 5d888bfddb..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewConfigurationProducer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Configuration
-public class EntityViewConfigurationProducer {
-
-    private final EntityViewConfiguration configuration = EntityViews.createDefaultConfiguration();
-    private PlatformTransactionManager tm;
-
-    public EntityViewConfigurationProducer(Set<Class<?>> entityViewClasses, Set<Class<?>> entityViewListenerClasses) {
-        for (Class<?> entityViewClass : entityViewClasses) {
-            configuration.addEntityView(entityViewClass);
-        }
-        for (Class<?> entityViewListenerClass : entityViewListenerClasses) {
-            configuration.addEntityViewListener(entityViewListenerClass);
-        }
-    }
-
-    @Autowired(required = false)
-    public void setTm(PlatformTransactionManager tm) {
-        this.tm = tm;
-    }
-
-    @Bean
-    public EntityViewConfiguration getEntityViewConfiguration() {
-        if (tm != null) {
-            configuration.setTransactionSupport(new SpringTransactionSupport(tm));
-        }
-        return configuration;
-    }
-
-
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewNamespaceHandler.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewNamespaceHandler.java
deleted file mode 100644
index 3695a3bacf..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewNamespaceHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewNamespaceHandler extends NamespaceHandlerSupport {
-    @Override
-    public void init() {
-        registerBeanDefinitionParser("entity-views", new EntityViewRegistrar());
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewRegistrar.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewRegistrar.java
deleted file mode 100644
index da9973e5ce..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/EntityViewRegistrar.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.ReaderContext;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.w3c.dom.Element;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class EntityViewRegistrar implements ImportBeanDefinitionRegistrar, BeanDefinitionParser, ResourceLoaderAware, EnvironmentAware {
-
-    private ResourceLoader resourceLoader;
-    private Environment environment;
-
-    @Override
-    public void setEnvironment(Environment environment) {
-        this.environment = environment;
-    }
-
-    @Override
-    public void setResourceLoader(ResourceLoader resourceLoader) {
-        this.resourceLoader = resourceLoader;
-    }
-
-    @Override
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        try {
-            Environment environment = parserContext.getReaderContext().getEnvironment();
-            BeanDefinitionRegistry registry = parserContext.getRegistry();
-            XmlEntityViewConfigurationSource configurationSource = new XmlEntityViewConfigurationSource(element, parserContext, environment);
-
-            if (!configurationSource.getBasePackages().iterator().hasNext()) {
-                parserContext.getReaderContext().error("You have to specify at least one base package for entity views!", element);
-            }
-
-            EntityViewConfigurationDelegate delegate = new EntityViewConfigurationDelegate(configurationSource, resourceLoader, environment);
-            delegate.registerEntityViews(registry);
-        } catch (RuntimeException e) {
-            handleError(e, element, parserContext.getReaderContext());
-        }
-
-        return null;
-    }
-
-    private void handleError(Exception e, Element source, ReaderContext reader) {
-        reader.error(e.getMessage(), reader.extractSource(source), e);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        AnnotationEntityViewConfigurationSource configurationSource = new AnnotationEntityViewConfigurationSource(
-                importingClassMetadata, EnableEntityViews.class, resourceLoader, environment);
-
-        EntityViewConfigurationDelegate delegate = new EntityViewConfigurationDelegate(configurationSource, resourceLoader, environment);
-        delegate.registerEntityViews(registry);
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionAccessFactory.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionAccessFactory.java
deleted file mode 100644
index f90207af71..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionAccessFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Christian Beikov
- * @since 1.4.0
- */
-public class SpringTransactionAccessFactory implements TransactionAccessFactory {
-
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        if (TransactionSynchronizationManager.isActualTransactionActive()) {
-            return SpringTransactionSynchronizationStrategy.INSTANCE;
-        }
-        return null;
-    }
-
-    @Override
-    public int getPriority() {
-        return 99;
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSupport.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSupport.java
deleted file mode 100644
index 7365c0667a..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSupport.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * @author Christian Beikov
- * @since 1.4.0
- */
-public class SpringTransactionSupport implements TransactionSupport {
-
-    private final PlatformTransactionManager tm;
-
-    public SpringTransactionSupport(PlatformTransactionManager tm) {
-        this.tm = tm;
-    }
-
-    @Override
-    public void transactional(final Runnable runnable) {
-        TransactionTemplate transactionTemplate = new TransactionTemplate(tm);
-        transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-        transactionTemplate.execute(new TransactionCallback<Void>() {
-            @Override
-            public Void doInTransaction(TransactionStatus status) {
-                runnable.run();
-                return null;
-            }
-        });
-    }
-
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSynchronizationStrategy.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSynchronizationStrategy.java
deleted file mode 100644
index 36b4facef1..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/SpringTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import org.springframework.transaction.interceptor.TransactionInterceptor;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.4.0
- */
-public class SpringTransactionSynchronizationStrategy implements TransactionAccess {
-
-    public static final SpringTransactionSynchronizationStrategy INSTANCE = new SpringTransactionSynchronizationStrategy();
-
-    private SpringTransactionSynchronizationStrategy() {
-    }
-
-    @Override
-    public boolean isActive() {
-        return TransactionSynchronizationManager.isActualTransactionActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        TransactionInterceptor.currentTransactionStatus().setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationWrapper(synchronization));
-    }
-
-    /**
-     *
-     * @author Christian Beikov
-     * @since 1.4.0
-     */
-    private static class TransactionSynchronizationWrapper implements TransactionSynchronization {
-
-        private final Synchronization synchronization;
-
-        public TransactionSynchronizationWrapper(Synchronization synchronization) {
-            this.synchronization = synchronization;
-        }
-
-        @Override
-        public void suspend() {
-            // No-op
-        }
-
-        @Override
-        public void resume() {
-            // No-op
-        }
-
-        @Override
-        public void flush() {
-            // No-op
-        }
-
-        @Override
-        public void beforeCommit(boolean readOnly) {
-            // No-op
-        }
-
-        @Override
-        public void beforeCompletion() {
-            synchronization.beforeCompletion();
-        }
-
-        @Override
-        public void afterCommit() {
-            // No-op
-        }
-
-        @Override
-        public void afterCompletion(int status) {
-            switch (status) {
-                case TransactionSynchronization.STATUS_COMMITTED:
-                    status = Status.STATUS_COMMITTED;
-                    break;
-                case TransactionSynchronization.STATUS_ROLLED_BACK:
-                    status = Status.STATUS_ROLLEDBACK;
-                    break;
-                default:
-                    status = Status.STATUS_UNKNOWN;
-                    break;
-            }
-            synchronization.afterCompletion(status);
-        }
-    }
-
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/TypeFilterParser.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/TypeFilterParser.java
deleted file mode 100644
index d01560726e..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/TypeFilterParser.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2014 - 2024 Blazebit.
- * Copyright 2010-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.parsing.ReaderContext;
-import org.springframework.beans.factory.xml.XmlReaderContext;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.AspectJTypeFilter;
-import org.springframework.core.type.filter.AssignableTypeFilter;
-import org.springframework.core.type.filter.RegexPatternTypeFilter;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.regex.Pattern;
-
-/**
- * I copied this from Spring Data because introducing a dependency to spring-data-commons is not an option since the
- * blaze-persistence-entity-view-spring integration should be independent of Spring Data.
- *
- * Parser to populate the given {@link ClassPathScanningCandidateComponentProvider} with {@link TypeFilter}s parsed from
- * the given {@link Element}'s children.
- *
- * @author Oliver Gierke
- * @since 1.2.0
- */
-public class TypeFilterParser {
-
-    private static final String FILTER_TYPE_ATTRIBUTE = "type";
-    private static final String FILTER_EXPRESSION_ATTRIBUTE = "expression";
-
-    private final ReaderContext readerContext;
-    private final ClassLoader classLoader;
-
-    /**
-     * Creates a new {@link TypeFilterParser} with the given {@link ReaderContext}.
-     *
-     * @param readerContext must not be {@literal null}.
-     */
-    public TypeFilterParser(XmlReaderContext readerContext) {
-        this(readerContext, readerContext.getResourceLoader().getClassLoader());
-    }
-
-    /**
-     * Constructor to ease testing as {@link XmlReaderContext#getBeanClassLoader()} is final and thus cannot be mocked
-     * easily.
-     *
-     * @param readerContext must not be {@literal null}.
-     * @param classLoader must not be {@literal null}.
-     */
-    TypeFilterParser(ReaderContext readerContext, ClassLoader classLoader) {
-
-        Assert.notNull(readerContext, "ReaderContext must not be null!");
-        Assert.notNull(classLoader, "ClassLoader must not be null!");
-
-        this.readerContext = readerContext;
-        this.classLoader = classLoader;
-    }
-
-    /**
-     * Returns all {@link TypeFilter} declared in nested elements of the given {@link Element}. Allows to selectively
-     * retrieve including or excluding filters based on the given {@link Type}.
-     *
-     * @param element must not be {@literal null}.
-     * @param type must not be {@literal null}.
-     * @return
-     */
-    public Collection<TypeFilter> parseTypeFilters(Element element, Type type) {
-
-        NodeList nodeList = element.getChildNodes();
-        Collection<TypeFilter> filters = new HashSet<TypeFilter>();
-
-        for (int i = 0; i < nodeList.getLength(); i++) {
-
-            Node node = nodeList.item(i);
-            Element childElement = type.getElement(node);
-
-            if (childElement != null) {
-
-                try {
-                    filters.add(createTypeFilter(childElement, classLoader));
-                } catch (RuntimeException e) {
-                    readerContext.error(e.getMessage(), readerContext.extractSource(element), e.getCause());
-                }
-            }
-        }
-
-        return filters;
-    }
-
-    /**
-     * Createsa a {@link TypeFilter} instance from the given {@link Element} and {@link ClassLoader}.
-     *
-     * @param element must not be {@literal null}.
-     * @param classLoader must not be {@literal null}.
-     * @return
-     */
-    protected TypeFilter createTypeFilter(Element element, ClassLoader classLoader) {
-
-        String filterType = element.getAttribute(FILTER_TYPE_ATTRIBUTE);
-        String expression = element.getAttribute(FILTER_EXPRESSION_ATTRIBUTE);
-
-        try {
-
-            FilterType filter = FilterType.fromString(filterType);
-            return filter.getFilter(expression, classLoader);
-
-        } catch (ClassNotFoundException ex) {
-            throw new FatalBeanException("Type filter class not found: " + expression, ex);
-        }
-    }
-
-    /**
-     * Enum representing all the filter types available for {@code include} and {@code exclude} elements. This acts as
-     * factory for {@link TypeFilter} instances.
-     *
-     * @author Oliver Gierke
-     * @see #getFilter(String, ClassLoader)
-     */
-    private static enum FilterType {
-
-        ANNOTATION {
-            @Override
-            @SuppressWarnings("unchecked")
-            public TypeFilter getFilter(String expression, ClassLoader classLoader) throws ClassNotFoundException {
-                return new AnnotationTypeFilter((Class<Annotation>) classLoader.loadClass(expression));
-            }
-        },
-
-        ASSIGNABLE {
-            @Override
-            public TypeFilter getFilter(String expression, ClassLoader classLoader) throws ClassNotFoundException {
-                return new AssignableTypeFilter(classLoader.loadClass(expression));
-            }
-        },
-
-        ASPECTJ {
-            @Override
-            public TypeFilter getFilter(String expression, ClassLoader classLoader) {
-                return new AspectJTypeFilter(expression, classLoader);
-            }
-        },
-
-        REGEX {
-            @Override
-            public TypeFilter getFilter(String expression, ClassLoader classLoader) {
-                return new RegexPatternTypeFilter(Pattern.compile(expression));
-            }
-        },
-
-        CUSTOM {
-            @Override
-            public TypeFilter getFilter(String expression, ClassLoader classLoader) throws ClassNotFoundException {
-
-                Class<?> filterClass = classLoader.loadClass(expression);
-                if (!TypeFilter.class.isAssignableFrom(filterClass)) {
-                    throw new IllegalArgumentException("Class is not assignable to [" + TypeFilter.class.getName() + "]: "
-                            + expression);
-                }
-                return (TypeFilter) BeanUtils.instantiateClass(filterClass);
-            }
-        };
-
-        /**
-         * Returns the {@link TypeFilter} for the given expression and {@link ClassLoader}.
-         *
-         * @param expression The expression
-         * @param classLoader The class loader
-         * @return The type filter
-         * @throws ClassNotFoundException
-         */
-        abstract TypeFilter getFilter(String expression, ClassLoader classLoader) throws ClassNotFoundException;
-
-        /**
-         * Returns the {@link FilterType} for the given type as {@link String}.
-         *
-         * @param typeString The type string
-         * @return The filter type
-         * @throws IllegalArgumentException if no {@link FilterType} could be found for the given argument.
-         */
-        static FilterType fromString(String typeString) {
-
-            for (FilterType filter : FilterType.values()) {
-                if (filter.name().equalsIgnoreCase(typeString)) {
-                    return filter;
-                }
-            }
-
-            throw new IllegalArgumentException("Unsupported filter type: " + typeString);
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    public static enum Type {
-
-        INCLUDE("include-filter"), EXCLUDE("exclude-filter");
-
-        private String elementName;
-
-        private Type(String elementName) {
-            this.elementName = elementName;
-        }
-
-        /**
-         * Returns the {@link Element} if the given {@link Node} is an {@link Element} and it's name equals the one of the
-         * type.
-         *
-         * @param node
-         * @return
-         */
-        Element getElement(Node node) {
-
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
-                String localName = node.getLocalName();
-                if (elementName.equals(localName)) {
-                    return (Element) node;
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/XmlEntityViewConfigurationSource.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/XmlEntityViewConfigurationSource.java
deleted file mode 100644
index c58bf0985e..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/impl/XmlEntityViewConfigurationSource.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.impl;
-
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.core.env.Environment;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class XmlEntityViewConfigurationSource extends AbstractEntityViewConfigurationSource {
-
-    private static final String BASE_PACKAGE = "base-package";
-
-    private final Element element;
-    private final ParserContext context;
-
-    private final Collection<TypeFilter> includeFilters;
-    private final Collection<TypeFilter> excludeFilters;
-
-    public XmlEntityViewConfigurationSource(Element element, ParserContext context, Environment environment) {
-        super(environment);
-        Assert.notNull(element);
-        Assert.notNull(context);
-
-        this.element = element;
-        this.context = context;
-
-        TypeFilterParser parser = new TypeFilterParser(context.getReaderContext());
-        this.includeFilters = parser.parseTypeFilters(element, TypeFilterParser.Type.INCLUDE);
-        this.excludeFilters = parser.parseTypeFilters(element, TypeFilterParser.Type.EXCLUDE);
-    }
-
-    @Override
-    public Iterable<String> getBasePackages() {
-        String attribute = element.getAttribute(BASE_PACKAGE);
-        return Arrays.asList(StringUtils.delimitedListToStringArray(attribute, ",", " "));
-    }
-
-    @Override
-    protected Iterable<TypeFilter> getExcludeFilters() {
-        return excludeFilters;
-    }
-
-    @Override
-    protected Iterable<TypeFilter> getIncludeFilters() {
-        return includeFilters;
-    }
-}
diff --git a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/package-info.java b/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/package-info.java
deleted file mode 100644
index 6e27ca365f..0000000000
--- a/integration/entity-view-spring/src/main/java/com/blazebit/persistence/integration/view/spring/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-/**
- * Blaze-Persistence Entity Views Spring integration.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-package com.blazebit.persistence.integration.view.spring;
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory b/integration/entity-view-spring/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory
deleted file mode 100644
index 51eb65678f..0000000000
--- a/integration/entity-view-spring/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.view.spring.impl.SpringTransactionAccessFactory
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/main/resources/META-INF/spring.handlers b/integration/entity-view-spring/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 46c02b938b..0000000000
--- a/integration/entity-view-spring/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2014 - 2024 Blazebit.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-http\://persistence.blazebit.com/view/spring=com.blazebit.persistence.integration.view.spring.impl.EntityViewNamespaceHandler
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/main/resources/META-INF/spring.schemas b/integration/entity-view-spring/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 6296328af9..0000000000
--- a/integration/entity-view-spring/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2014 - 2024 Blazebit.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-http\://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd=/com/blazebit/persistence/integration/view/spring/spring-entity-views-1.2.xsd
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/main/resources/com/blazebit/persistence/integration/view/spring/spring-entity-views-1.2.xsd b/integration/entity-view-spring/src/main/resources/com/blazebit/persistence/integration/view/spring/spring-entity-views-1.2.xsd
deleted file mode 100644
index 91fc397df7..0000000000
--- a/integration/entity-view-spring/src/main/resources/com/blazebit/persistence/integration/view/spring/spring-entity-views-1.2.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<xsd:schema xmlns="http://persistence.blazebit.com/view/spring"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:context="http://www.springframework.org/schema/context"
-            targetNamespace="http://persistence.blazebit.com/view/spring" elementFormDefault="qualified">
-
-    <xsd:import namespace="http://www.springframework.org/schema/context"
-                schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
-
-    <xsd:element name="entity-views">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="include-filter" type="context:filterType" minOccurs="0" maxOccurs="unbounded">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
-   Controls which eligible types to include for component scanning.
-                           ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="exclude-filter" type="context:filterType" minOccurs="0" maxOccurs="unbounded">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
-   Controls which eligible types to exclude for component scanning.
-                       ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="base-package" type="xsd:string" use="required">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
-   Defines the base package where the entity views will be tried to be detected.
-                ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackageClassesTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackageClassesTest.java
deleted file mode 100644
index 8683c2b039..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackageClassesTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationBasePackageClassesTest.TestConfig.class)
-public class AnnotationBasePackageClassesTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(basePackageClasses = TestView1.class)
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackagesTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackagesTest.java
deleted file mode 100644
index 6c0ee7a59a..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationBasePackagesTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationBasePackagesTest.TestConfig.class)
-public class AnnotationBasePackagesTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(basePackages = "com.blazebit.persistence.integration.view.spring.views.sub1")
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationClassLoaderTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationClassLoaderTest.java
deleted file mode 100644
index ceb87d93e7..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationClassLoaderTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationClassLoaderTest.TestConfig.class
-)
-public class AnnotationClassLoaderTest {
-
-    static final AtomicInteger trackedClassLoaderViews = new AtomicInteger();
-    static final ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
-
-    static {
-        Thread.currentThread().setContextClassLoader(new TrackingClassLoader());
-    }
-
-    @AfterClass
-    public static void resetClassLoader() {
-        Thread.currentThread().setContextClassLoader(previousClassLoader);
-    }
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjectionWithCustomLoader() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(2, entityViews.size());
-        Assert.assertEquals(2, trackedClassLoaderViews.get());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-    @Configuration
-    @EnableEntityViews
-    static class TestConfig {
-    }
-
-    private static class TrackingClassLoader extends ClassLoader {
-        @Override
-        public Class<?> loadClass(String name) throws ClassNotFoundException {
-            if (Objects.equals(TestView1.class.getName(), name) || Objects.equals(TestView2.class.getName(), name)) {
-                trackedClassLoaderViews.incrementAndGet();
-            }
-            return super.loadClass(name);
-        }
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAnnotationFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAnnotationFilterTest.java
deleted file mode 100644
index 293725c80c..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAnnotationFilterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.qualifier.TestEntityViewQualifier;
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationExcludeAnnotationFilterTest.TestConfig.class)
-public class AnnotationExcludeAnnotationFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(excludeFilters = {
-            @ComponentScan.Filter(type = FilterType.ANNOTATION, value = TestEntityViewQualifier.class)
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAssignableFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAssignableFilterTest.java
deleted file mode 100644
index 1cbb26ce42..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeAssignableFilterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.SomeSuperInterface;
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationExcludeAssignableFilterTest.TestConfig.class)
-public class AnnotationExcludeAssignableFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(excludeFilters = {
-            @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SomeSuperInterface.class)
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeRegexFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeRegexFilterTest.java
deleted file mode 100644
index 3a36464abc..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationExcludeRegexFilterTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationExcludeRegexFilterTest.TestConfig.class)
-public class AnnotationExcludeRegexFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(excludeFilters = {
-            @ComponentScan.Filter(type = FilterType.REGEX, pattern = {".*2$"})
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAnnotationFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAnnotationFilterTest.java
deleted file mode 100644
index e3a9b8dab8..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAnnotationFilterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.qualifier.TestEntityViewQualifier;
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationIncludeAnnotationFilterTest.TestConfig.class)
-public class AnnotationIncludeAnnotationFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(includeFilters = {
-            @ComponentScan.Filter(type = FilterType.ANNOTATION, value = TestEntityViewQualifier.class)
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAssignableFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAssignableFilterTest.java
deleted file mode 100644
index 5f33e9e585..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeAssignableFilterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.SomeSuperInterface;
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationIncludeAssignableFilterTest.TestConfig.class)
-public class AnnotationIncludeAssignableFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(includeFilters = {
-            @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SomeSuperInterface.class)
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeRegexFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeRegexFilterTest.java
deleted file mode 100644
index 28c4b72400..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationIncludeRegexFilterTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationIncludeRegexFilterTest.TestConfig.class)
-public class AnnotationIncludeRegexFilterTest {
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews(includeFilters = {
-            @ComponentScan.Filter(type = FilterType.REGEX, pattern = {".*1$"})
-    })
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationPlainTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationPlainTest.java
deleted file mode 100644
index 9bf93984e9..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationPlainTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationPlainTest.TestConfig.class)
-public class AnnotationPlainTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(2, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-    @Configuration
-    @EnableEntityViews
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationValueTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationValueTest.java
deleted file mode 100644
index 7220ec4aab..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/AnnotationValueTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AnnotationValueTest.TestConfig.class)
-public class AnnotationValueTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-    @Configuration
-    @EnableEntityViews("com.blazebit.persistence.integration.view.spring.views.sub1")
-    static class TestConfig {
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/CombinedConfigTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/CombinedConfigTest.java
deleted file mode 100644
index 19bef5f47a..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/CombinedConfigTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = CombinedConfigTest.TestConfig.class)
-public class CombinedConfigTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(2, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-    @Configuration
-    @EnableEntityViews("com.blazebit.persistence.integration.view.spring.views.sub2")
-    @ImportResource("/com/blazebit/persistence/integration/view/spring/entity-views-config.xml")
-    static class TestConfig {
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlConfigTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlConfigTest.java
deleted file mode 100644
index 9fc60dd6a0..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlConfigTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("entity-views-config.xml")
-public class XmlConfigTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAnnotationFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAnnotationFilterTest.java
deleted file mode 100644
index de3280b4c8..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAnnotationFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("exclude-annotation-filter-config.xml")
-public class XmlExcludeAnnotationFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAssignableFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAssignableFilterTest.java
deleted file mode 100644
index dd2d854dc0..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeAssignableFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("exclude-assignable-filter-config.xml")
-public class XmlExcludeAssignableFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeRegexFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeRegexFilterTest.java
deleted file mode 100644
index 5fcd2b768e..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlExcludeRegexFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("exclude-regex-filter-config.xml")
-public class XmlExcludeRegexFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAnnotationFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAnnotationFilterTest.java
deleted file mode 100644
index dc1237c595..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAnnotationFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub2.TestView2;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("include-annotation-filter-config.xml")
-public class XmlIncludeAnnotationFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView2.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAssignableFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAssignableFilterTest.java
deleted file mode 100644
index f8c256b9b8..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeAssignableFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("include-assignable-filter-config.xml")
-public class XmlIncludeAssignableFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeRegexFilterTest.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeRegexFilterTest.java
deleted file mode 100644
index 5792cf8d73..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/XmlIncludeRegexFilterTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring;
-
-import com.blazebit.persistence.integration.view.spring.views.sub1.TestView1;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.inject.Inject;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("include-regex-filter-config.xml")
-public class XmlIncludeRegexFilterTest {
-
-    @Inject
-    private EntityViewConfiguration entityViewConfiguration;
-
-    @Test
-    public void testInjection() {
-        Set<Class<?>> entityViews = entityViewConfiguration.getEntityViews();
-        Assert.assertEquals(1, entityViews.size());
-        Assert.assertTrue(entityViewConfiguration.getEntityViews().contains(TestView1.class));
-    }
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/entity/TestEntity.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/entity/TestEntity.java
deleted file mode 100644
index 81aaa3cb12..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/entity/TestEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Entity
-public class TestEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/qualifier/TestEntityViewQualifier.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/qualifier/TestEntityViewQualifier.java
deleted file mode 100644
index 72733ee4f2..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/qualifier/TestEntityViewQualifier.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.qualifier;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TestEntityViewQualifier {
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/SomeSuperInterface.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/SomeSuperInterface.java
deleted file mode 100644
index 9bfebe54b7..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/SomeSuperInterface.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.view.spring.views;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public interface SomeSuperInterface {
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub1/TestView1.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub1/TestView1.java
deleted file mode 100644
index f691742ddd..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub1/TestView1.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.views.sub1;
-
-import com.blazebit.persistence.integration.view.spring.entity.TestEntity;
-import com.blazebit.persistence.integration.view.spring.views.SomeSuperInterface;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@EntityView(TestEntity.class)
-public interface TestView1 extends SomeSuperInterface {
-
-    @IdMapping
-    public String getId();
-
-}
diff --git a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub2/TestView2.java b/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub2/TestView2.java
deleted file mode 100644
index 1220a305de..0000000000
--- a/integration/entity-view-spring/src/test/java/com/blazebit/persistence/integration/view/spring/views/sub2/TestView2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.view.spring.views.sub2;
-
-import com.blazebit.persistence.integration.view.spring.entity.TestEntity;
-import com.blazebit.persistence.integration.view.spring.qualifier.TestEntityViewQualifier;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-import com.blazebit.persistence.view.Mapping;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@TestEntityViewQualifier
-@EntityView(TestEntity.class)
-public interface TestView2 {
-
-    @IdMapping
-    public String getId();
-
-    @Mapping("id + 2")
-    public String getIdPlusTwo();
-
-}
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/entity-views-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/entity-views-config.xml
deleted file mode 100644
index 7eee8c270a..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/entity-views-config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views.sub1"/>
-
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-annotation-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-annotation-filter-config.xml
deleted file mode 100644
index 38795639d5..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-annotation-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:exclude-filter type="annotation" expression="com.blazebit.persistence.integration.view.spring.qualifier.TestEntityViewQualifier"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-assignable-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-assignable-filter-config.xml
deleted file mode 100644
index ebd80adc2b..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-assignable-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:exclude-filter type="assignable" expression="com.blazebit.persistence.integration.view.spring.views.SomeSuperInterface"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-regex-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-regex-filter-config.xml
deleted file mode 100644
index f8404e8d5b..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/exclude-regex-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:exclude-filter type="regex" expression=".*1$"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-annotation-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-annotation-filter-config.xml
deleted file mode 100644
index 1edc2eb11d..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-annotation-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:include-filter type="annotation" expression="com.blazebit.persistence.integration.view.spring.qualifier.TestEntityViewQualifier"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-assignable-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-assignable-filter-config.xml
deleted file mode 100644
index d82325a264..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-assignable-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:include-filter type="assignable" expression="com.blazebit.persistence.integration.view.spring.views.SomeSuperInterface"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-regex-filter-config.xml b/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-regex-filter-config.xml
deleted file mode 100644
index a0bc782924..0000000000
--- a/integration/entity-view-spring/src/test/resources/com/blazebit/persistence/integration/view/spring/include-regex-filter-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:ev="http://persistence.blazebit.com/view/spring"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://persistence.blazebit.com/view/spring http://persistence.blazebit.com/view/spring/spring-entity-views-1.2.xsd">
-
-    <ev:entity-views base-package="com.blazebit.persistence.integration.view.spring.views">
-        <ev:include-filter type="regex" expression=".*1$"/>
-    </ev:entity-views>
-</beans>
\ No newline at end of file
diff --git a/integration/entity-view-spring/src/test/resources/logback-test.xml b/integration/entity-view-spring/src/test/resources/logback-test.xml
deleted file mode 100644
index 0f318994b6..0000000000
--- a/integration/entity-view-spring/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <logger name="org.springframework.core " level="error" />
-    <logger name="org.springframework.beans" level="error" />
-    <logger name="org.springframework.context" level="error" />
-    <logger name="org.springframework.transaction" level="error" />
-    <logger name="org.springframework.web" level="error" />
-    <logger name="org.springframework.test" level="error" />
-    <logger name="org.hibernate" level="error" />
-<!--    <logger name="org.hibernate.SQL" level="debug" />-->
-</configuration>
\ No newline at end of file
diff --git a/integration/graphql-dgs-7.0/pom.xml b/integration/graphql-dgs-7.0/pom.xml
index e2f8593164..7d12143926 100644
--- a/integration/graphql-dgs-7.0/pom.xml
+++ b/integration/graphql-dgs-7.0/pom.xml
@@ -1,218 +1,220 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>blaze-persistence-integration</artifactId>
-    <groupId>com.blazebit</groupId>
-    <version>1.6.15-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blaze-persistence-integration</artifactId>
+        <groupId>com.blazebit</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>blaze-persistence-integration-graphql-dgs-7.0</artifactId>
+    <artifactId>blaze-persistence-integration-graphql-dgs-7.0</artifactId>
 
-  <name>Blazebit Persistence Integration GraphQL DGS 7.0</name>
+    <name>Blazebit Persistence Integration GraphQL DGS 7.0</name>
 
-  <properties>
-    <module.name>com.blazebit.persistence.integration.graphql.dgs</module.name>
-    <main.java.version>17</main.java.version>
-    <version.spring>${version.spring-data-3.1-spring}</version.spring>
-    <version.spring.boot>${version.spring-data-3.1-spring-boot}</version.spring.boot>
-    <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-  </properties>
+    <properties>
+        <module.name>com.blazebit.persistence.integration.graphql.dgs</module.name>
+        <main.java.version>17</main.java.version>
+        <version.spring>${version.spring-data-3.1-spring}</version.spring>
+        <version.spring.boot>${version.spring-data-3.1-spring-boot}</version.spring.boot>
+        <version.hibernate>${version.hibernate-6.2}</version.hibernate>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.persistence</groupId>
-      <artifactId>jakarta.persistence-api</artifactId>
-      <version>${version.jakarta-jpa-3.1-api}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.graphql-java</groupId>
-      <artifactId>graphql-java</artifactId>
-      <version>20.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.graphql.dgs</groupId>
-      <artifactId>graphql-dgs-spring-boot-starter</artifactId>
-      <version>7.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.graphql.dgs</groupId>
-      <artifactId>graphql-dgs-extended-scalars</artifactId>
-      <version>7.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <version>${version.spring.boot}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${version.spring}</version>
-      <scope>provided</scope>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-graphql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java</artifactId>
+            <version>20.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.graphql.dgs</groupId>
+            <artifactId>graphql-dgs-spring-boot-starter</artifactId>
+            <version>7.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.graphql.dgs</groupId>
+            <artifactId>graphql-dgs-extended-scalars</artifactId>
+            <version>7.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${version.spring.boot}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-core</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${version.spring}</version>
+            <scope>provided</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-      <scope>provided</scope>
-    </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <version>${version.spring.boot}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-jpa</artifactId>
-      <version>${version.spring.boot}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hibernate.orm</groupId>
-          <artifactId>hibernate-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.orm</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>${version.hibernate}</version>
-      <scope>test</scope>
-    </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${version.spring.boot}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${version.spring.boot}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate}</version>
+            <scope>test</scope>
+        </dependency>
 
-    <!-- Spring-Data dependencies -->
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-jpa</artifactId>
-      <version>${version.spring-data-3.1}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <version>1.9.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>${version.jakarta-annotation}</version>
-      <scope>provided</scope>
-    </dependency>
+        <!-- Spring-Data dependencies -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${version.spring-data-3.1}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${version.annotation-api}</version>
+            <scope>provided</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-      <version>${version.spring}</version>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>${version.spring}</version>
+            <scope>test</scope>
+        </dependency>
 
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jboss.jandex</groupId>
-        <artifactId>jandex-maven-plugin</artifactId>
-        <version>1.0.8</version>
-        <executions>
-          <execution>
-            <id>make-index</id>
-            <goals>
-              <goal>jandex</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-module-infos</id>
-            <phase>package</phase>
-            <goals>
-              <goal>add-module-info</goal>
-            </goals>
-            <configuration>
-              <module>
-                <moduleInfoSource>
-                  module ${module.name} {
-                  requires transitive com.blazebit.persistence.view;
-                  requires com.blazebit.common.utils;
-                  exports com.blazebit.persistence.integration.graphql.dgs;
-                  }
-                </moduleInfoSource>
-              </module>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <version>1.0.8</version>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/integration/graphql-dgs-7.0/src/main/java/module-info.java b/integration/graphql-dgs-7.0/src/main/java/module-info.java
new file mode 100644
index 0000000000..24218f535a
--- /dev/null
+++ b/integration/graphql-dgs-7.0/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.graphql.dgs {
+	requires com.blazebit.persistence.integration.graphql;
+	requires graphql.dgs;
+	requires com.graphqljava;
+	requires spring.boot.autoconfigure;
+	requires spring.context;
+	requires com.blazebit.persistence.view.impl;
+	requires com.blazebit.persistence.view;
+	requires kotlin.reflect;
+	requires kotlin.stdlib.common;
+	requires static annotations;
+	exports com.blazebit.persistence.integration.graphql.dgs;
+	opens com.blazebit.persistence.integration.graphql.dgs to spring.core;
+}
\ No newline at end of file
diff --git a/integration/graphql-dgs/pom.xml b/integration/graphql-dgs/pom.xml
deleted file mode 100644
index 8c89131168..0000000000
--- a/integration/graphql-dgs/pom.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
-
-    <name>Blazebit Persistence Integration GraphQL DGS</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.graphql.dgs</module.name>
-        <main.java.version>1.8</main.java.version>
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-        <version.hibernate>${version.hibernate-5.6}</version.hibernate>
-        <version.dgs>5.5.3</version.dgs>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.graphql-java</groupId>
-            <artifactId>graphql-java</artifactId>
-            <version>19.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.graphql.dgs</groupId>
-            <artifactId>graphql-dgs-spring-boot-starter</artifactId>
-            <version>${version.dgs}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.graphql.dgs</groupId>
-            <artifactId>graphql-dgs-extended-scalars</artifactId>
-            <version>${version.dgs}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-autoconfigure</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${version.spring.boot}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${version.spring}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <version>${version.spring.boot}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${version.spring.boot}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${version.spring.boot}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Spring-Data dependencies -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.7}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>1.9.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${version.spring}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jaxb-api}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jaxb}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.smallrye</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <version>${version.jandex.plugin}</version>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.integration.graphql.dgs;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/BlazePersistenceDgsAutoConfiguration.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/BlazePersistenceDgsAutoConfiguration.java
deleted file mode 100644
index 7a398093e6..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/BlazePersistenceDgsAutoConfiguration.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs;
-
-import com.blazebit.persistence.integration.graphql.GraphQLEntityViewSupport;
-import com.blazebit.persistence.integration.graphql.GraphQLEntityViewSupportFactory;
-import com.blazebit.persistence.integration.graphql.dgs.converter.ByteInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.converter.IntegerInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.converter.LongInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.converter.ShortInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.converter.StringInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.converter.UUIDInputIdConverter;
-import com.blazebit.persistence.integration.graphql.dgs.mapper.EntityViewInputObjectMapper;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.netflix.graphql.dgs.DgsComponent;
-import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry;
-import graphql.schema.idl.TypeDefinitionRegistry;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * The following is a bit against the <a href="https://netflix.github.io/dgs/getting-started/#creating-a-schema">schema first DGS principle</a>
- * but we do it anyway since it's a lot easier to work this way than to define types twice and try to make sure they match up.
- *
- * @author Christian Beikov
- * @since 1.6.9
- */
-@Configuration
-@DgsComponent
-@Import({
-    EntityViewInputObjectMapper.class,
-    ByteInputIdConverter.class,
-    ShortInputIdConverter.class,
-    IntegerInputIdConverter.class,
-    LongInputIdConverter.class,
-    UUIDInputIdConverter.class,
-    StringInputIdConverter.class
-})
-@ImportAutoConfiguration(GraphQLEntityViewSupportFactoryAutoConfiguration.class)
-public class BlazePersistenceDgsAutoConfiguration {
-    private GraphQLEntityViewSupport graphQLEntityViewSupport;
-    private TypeDefinitionRegistry typeRegistry;
-
-    /**
-     * The constructor creates the {@link TypeDefinitionRegistry} that is later exposed via @DgsTypeDefinitionRegistry.
-     * It is done here since we have a ordering constraint, graphQLEntityViewSupportFactory need to fill it in its
-     * create method while creating the {@link GraphQLEntityViewSupport} that is later exposed as bean.
-     */
-    public BlazePersistenceDgsAutoConfiguration(EntityViewManager evm, GraphQLEntityViewSupportFactory graphQLEntityViewSupportFactory) {
-        this.typeRegistry = new TypeDefinitionRegistry();
-        this.graphQLEntityViewSupport = graphQLEntityViewSupportFactory.create(typeRegistry, evm);
-    }
-
-    @Bean
-    public GraphQLEntityViewSupport getSchema() {
-        return graphQLEntityViewSupport;
-    }
-
-    @SuppressWarnings("unused")
-    @DgsTypeDefinitionRegistry
-    public TypeDefinitionRegistry registry() {
-        return typeRegistry;
-    }
-
-
-}
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/GraphQLEntityViewSupportFactoryAutoConfiguration.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/GraphQLEntityViewSupportFactoryAutoConfiguration.java
deleted file mode 100644
index 3521c0d851..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/GraphQLEntityViewSupportFactoryAutoConfiguration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs;
-
-import com.blazebit.persistence.integration.graphql.GraphQLEntityViewSupportFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * This is the companion configuration for {@link BlazePersistenceDgsAutoConfiguration} and exposes the
- * {@link GraphQLEntityViewSupportFactory} as an optional bean, so it can be customized.
- *
- * @author Christian Beikov
- * @since 1.6.9
- */
-@Configuration
-public class GraphQLEntityViewSupportFactoryAutoConfiguration {
-    @Bean
-    @ConditionalOnMissingBean
-    public GraphQLEntityViewSupportFactory graphQLEntityViewSupportFactory() {
-        GraphQLEntityViewSupportFactory graphQLEntityViewSupportFactory = new GraphQLEntityViewSupportFactory(true, true);
-        graphQLEntityViewSupportFactory.setImplementRelayNode(false);
-        graphQLEntityViewSupportFactory.setDefineRelayNodeIfNotExist(true);
-        graphQLEntityViewSupportFactory.setRegisterScalarTypeDefinitions(true);
-        return graphQLEntityViewSupportFactory;
-    }
-
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ByteInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ByteInputIdConverter.java
deleted file mode 100644
index ab85d53773..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ByteInputIdConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Converter from {@link String} to {@link Byte}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class ByteInputIdConverter implements EntityViewInputIdTypeConverter<Byte> {
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return new HashSet<>(Arrays.asList(Byte.class, byte.class));
-    }
-
-    @Override
-    public Byte convert(final String value) {
-        return Byte.parseByte(value);
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/EntityViewInputIdTypeConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/EntityViewInputIdTypeConverter.java
deleted file mode 100644
index 16d3d98c7c..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/EntityViewInputIdTypeConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import java.util.Set;
-
-/**
- * A contract for converting a String of the GraphQL {@code ID} type to a different type.
- *
- * @param <T> The converted type
- * @author Tom Mayer
- * @since 1.6.9
- */
-public interface EntityViewInputIdTypeConverter<T> {
-    /**
-     * Returns the classes that this converter supports for conversion.
-     *
-     * @return the supported classes for conversion
-     */
-    Set<Class<?>> getSupportedClasses();
-
-    /**
-     * Converts the given string value to the type {@code T}.
-     *
-     * @param value The string value
-     * @return The converted value
-     */
-    T convert(String value);
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/IntegerInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/IntegerInputIdConverter.java
deleted file mode 100644
index 7ea0ac9bb4..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/IntegerInputIdConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Converter from {@link String} to {@link Integer}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class IntegerInputIdConverter implements EntityViewInputIdTypeConverter<Integer> {
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return new HashSet<>(Arrays.asList(Integer.class, int.class));
-    }
-
-    @Override
-    public Integer convert(final String value) {
-        return Integer.parseInt(value);
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/LongInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/LongInputIdConverter.java
deleted file mode 100644
index 609e4bd50c..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/LongInputIdConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Converter from {@link String} to {@link Long}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class LongInputIdConverter implements EntityViewInputIdTypeConverter<Long> {
-
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return new HashSet<>(Arrays.asList(Long.class, long.class));
-    }
-
-    @Override
-    public Long convert(final String value) {
-        return Long.parseLong(value);
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ShortInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ShortInputIdConverter.java
deleted file mode 100644
index 55c4f05b8d..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/ShortInputIdConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Converter from {@link String} to {@link Short}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class ShortInputIdConverter implements EntityViewInputIdTypeConverter<Short> {
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return new HashSet<>(Arrays.asList(Short.class, short.class));
-    }
-
-    @Override
-    public Short convert(final String value) {
-        return Short.parseShort(value);
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/StringInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/StringInputIdConverter.java
deleted file mode 100644
index a9bd7b015f..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/StringInputIdConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * Converter from {@link String} to {@link String}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class StringInputIdConverter implements EntityViewInputIdTypeConverter<String> {
-
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return Collections.singleton(String.class);
-    }
-
-    @Override
-    public String convert(final String value) {
-        return value;
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/UUIDInputIdConverter.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/UUIDInputIdConverter.java
deleted file mode 100644
index 93961f8886..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/converter/UUIDInputIdConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.converter;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * Converter from {@link String} to {@link UUID}.
- *
- * @author Tom Mayer
- * @since 1.6.9
- */
-@Component
-public class UUIDInputIdConverter implements EntityViewInputIdTypeConverter<UUID> {
-
-    @Override
-    public Set<Class<?>> getSupportedClasses() {
-        return Collections.singleton(UUID.class);
-    }
-
-    @Override
-    public UUID convert(final String value) {
-        return UUID.fromString(value);
-    }
-}
diff --git a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/mapper/EntityViewInputObjectMapper.java b/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/mapper/EntityViewInputObjectMapper.java
deleted file mode 100644
index bfe156ae6d..0000000000
--- a/integration/graphql-dgs/src/main/java/com/blazebit/persistence/integration/graphql/dgs/mapper/EntityViewInputObjectMapper.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.mapper;
-
-import com.blazebit.persistence.integration.graphql.dgs.converter.EntityViewInputIdTypeConverter;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.impl.metamodel.AbstractMethodAttribute;
-import com.blazebit.persistence.view.impl.metamodel.AbstractMethodPluralAttribute;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.persistence.view.metamodel.MethodAttribute;
-import com.blazebit.persistence.view.metamodel.ViewType;
-import com.netflix.graphql.dgs.internal.DefaultInputObjectMapper;
-import com.netflix.graphql.dgs.internal.InputObjectMapper;
-
-import java.util.*;
-
-import kotlin.reflect.KClass;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Christian Beikov
- * @since 1.6.9
- */
-@Component
-public class EntityViewInputObjectMapper implements InputObjectMapper {
-
-    private static final InputObjectMapper DEFAULT = new DefaultInputObjectMapper();
-    private final EntityViewManager entityViewManager;
-    private final ClassValue<EntityViewInputIdTypeConverter<?>> idTypeConverters;
-
-    EntityViewInputObjectMapper(EntityViewManager entityViewManager, List<EntityViewInputIdTypeConverter<?>> converters) {
-        this.entityViewManager = entityViewManager;
-        Map<Class<?>, EntityViewInputIdTypeConverter<?>> idTypeConverters = new HashMap<>(converters.size());
-        for (EntityViewInputIdTypeConverter<?> converter : converters) {
-            for (Class<?> supportedClass : converter.getSupportedClasses()) {
-                idTypeConverters.put(supportedClass, converter);
-            }
-        }
-        this.idTypeConverters = new ClassValue<EntityViewInputIdTypeConverter<?>>() {
-            @Override
-            protected EntityViewInputIdTypeConverter<?> computeValue(Class<?> type) {
-                return idTypeConverters.get(type);
-            }
-        };
-    }
-
-    @NotNull
-    @Override
-    public <T> T mapToKotlinObject(@NotNull Map<String, ?> map, @NotNull KClass<T> kClass) {
-        return DEFAULT.mapToKotlinObject(map, kClass);
-    }
-
-    @Override
-    public <T> T mapToJavaObject(@NotNull Map<String, ?> map, @NotNull Class<T> entityViewClass) {
-        ManagedViewType<T> managedViewType = entityViewManager.getMetamodel().managedView(entityViewClass);
-        if (managedViewType == null) {
-            return DEFAULT.mapToJavaObject(map, entityViewClass);
-        }
-        boolean updatable = managedViewType.isUpdatable();
-        boolean creatable = managedViewType.isCreatable();
-        T reference = null;
-
-        // Consume (i.e. remove from the payload json tree) the id if we are going to use getReference
-        Object id = retrieveId(map, managedViewType, !creatable || updatable);
-
-        // We create also creatable & updatable views if no id is given
-        // If an id is given in such a case, we create a reference for updates
-        if (creatable && (!updatable || id == null)) {
-            reference = entityViewManager.create(entityViewClass);
-        } else if (id != null) {
-            reference = entityViewManager.getReference(entityViewClass, id);
-        }
-
-        if (reference == null || map.isEmpty()) {
-            return reference;
-        }
-
-        try {
-            for (Map.Entry<String, ?> entry : map.entrySet()) {
-                String attributeName = entry.getKey();
-                Object value = entry.getValue();
-                //noinspection unchecked
-                AbstractMethodAttribute<? super T, ?> attribute = (AbstractMethodAttribute<? super T, ?>) managedViewType.getAttribute(attributeName);
-                Object entityViewValue;
-                if (value != null) {
-                    if (value instanceof Map<?, ?>) {
-                        //noinspection unchecked
-                        entityViewValue = mapToJavaObject((Map<String, ?>) value, attribute.getJavaType());
-                    } else if (value instanceof Collection<?>) {
-                        AbstractMethodPluralAttribute<?, ?, ?> pluralAttribute = (AbstractMethodPluralAttribute<?, ?, ?>) attribute;
-                        Class<?> elementJavaType = pluralAttribute.getElementType().getJavaType();
-                        //noinspection unchecked
-                        Collection<Object> collection = (Collection<Object>) pluralAttribute.getJavaMethod().invoke(reference);
-                        if (elementJavaType.isEnum()) {
-                            for (Object element : (Collection<?>) value) {
-                                //noinspection unchecked,rawtypes
-                                collection.add(Enum.valueOf((Class) elementJavaType, element.toString()));
-                            }
-                        } else if (pluralAttribute.isSubview()) {
-                            for (Object element : (Collection<?>) value) {
-                                //noinspection unchecked
-                                collection.add(mapToJavaObject((Map<String, ?>) element, elementJavaType));
-                            }
-                        } else {
-                            collection.addAll((Collection<?>) value);
-                        }
-                        // No need to invoke the setter since collection was retrieved through the getter
-                        continue;
-                    } else if (attribute.getJavaType().isEnum()) {
-                        //noinspection rawtypes,unchecked
-                        entityViewValue = Enum.valueOf((Class) attribute.getJavaType(), value.toString());
-                    } else {
-                        entityViewValue = value;
-                    }
-                } else {
-                    entityViewValue = null;
-                }
-                attribute.getSetterMethod().invoke(reference, entityViewValue);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Couldn't deserialize entity view", e);
-        }
-        return reference;
-    }
-
-    private Object retrieveId(Map<String, ?> map, ManagedViewType<?> managedViewType, boolean consume) {
-        MethodAttribute<?, ?> idAttribute;
-        Object id;
-        if (!(managedViewType instanceof ViewType<?>) || (idAttribute = ((ViewType<?>) managedViewType).getIdAttribute()) == null) {
-            id = null;
-        } else {
-            String idAttributeName = idAttribute.getName();
-            Object value = consume ? map.remove(idAttributeName) : map.get(idAttributeName);
-            if (value != null) {
-                if (value instanceof Map<?, ?>) {
-                    //noinspection unchecked
-                    id = mapToJavaObject((Map<String, ?>) value, idAttribute.getJavaType());
-                } else {
-                    EntityViewInputIdTypeConverter<?> converter = idTypeConverters.get(idAttribute.getJavaType());
-                    if (converter != null) {
-                        try {
-                            // since the graphql type is ID, we will always have a string value
-                            return converter.convert(value.toString());
-                        } catch (Exception e) {
-                            throw new RuntimeException("Couldn't deserialize entity view id attribute to type: " + idAttribute.getJavaType(), e);
-                        }
-                    }
-                    id = value;
-                }
-            } else {
-                id = null;
-            }
-        }
-
-        return id;
-    }
-}
diff --git a/integration/graphql-dgs/src/main/resources/META-INF/spring.factories b/integration/graphql-dgs/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 7dea1a6536..0000000000
--- a/integration/graphql-dgs/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.blazebit.persistence.integration.graphql.dgs.BlazePersistenceDgsAutoConfiguration
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/integration/graphql-dgs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index eff6b7deef..0000000000
--- a/integration/graphql-dgs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.graphql.dgs.BlazePersistenceDgsAutoConfiguration
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/AbstractSampleTest.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/AbstractSampleTest.java
deleted file mode 100644
index 6253461f24..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/AbstractSampleTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.integration.graphql.dgs.model.Person;
-import org.junit.Before;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.Consumer;
-
-/**
- * @author Christian Beikov
- * @since 1.6.4
- */
-public abstract class AbstractSampleTest {
-
-    @Autowired
-    DataInitializer dataInitializer;
-
-    @Before
-    public void init() {
-        dataInitializer.run(em -> {
-            ThreadLocalRandom random = ThreadLocalRandom.current();
-            List<Person> people = new ArrayList<>();
-            for (int i = 0; i < 4; i++) {
-                Person p = new Person("Person " + i);
-                people.add(p);
-                em.persist(p);
-            }
-            for (int i = 0; i < 100; i++) {
-                Cat c = new Cat("Cat " + i, random.nextInt(20), people.get(random.nextInt(4)));
-                em.persist(c);
-            }
-        });
-    }
-
-    @Transactional
-    @Component
-    public static class DataInitializer {
-
-        @Autowired
-        EntityManager em;
-
-        public void run(Consumer<EntityManager> c) {
-            c.accept(em);
-        }
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/Application.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/Application.java
deleted file mode 100644
index 3c8f2d3ec1..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/Application.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.integration.graphql.dgs.model.Person;
-import com.blazebit.persistence.integration.graphql.dgs.repository.CatJpaRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.data.web.config.EnableSpringDataWebSupport;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@SpringBootApplication
-@EnableSpringDataWebSupport
-@ComponentScan(basePackages = "com.blazebit.persistence.integration.graphql.dgs")
-public class Application {
-
-    @Autowired
-    EntityManager em;
-    @Autowired
-    CatJpaRepository catJpaRepository;
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class).getBean(Application.class).run();
-    }
-
-    @Transactional
-    public void run() {
-        ThreadLocalRandom random = ThreadLocalRandom.current();
-        List<Person> people = new ArrayList<>();
-        for (int i = 0; i < 4; i++) {
-            Person p = new Person("Person " + i);
-            people.add(p);
-            em.persist(p);
-        }
-        for (int i = 0; i < 100; i++) {
-            Cat c = new Cat("Cat " + i, random.nextInt(20), people.get(random.nextInt(4)));
-            catJpaRepository.save(c);
-        }
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/SampleTest.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/SampleTest.java
deleted file mode 100644
index 6f3ba90e78..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/SampleTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.List;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Christian Beikov
- * @since 1.6.4
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class SampleTest extends AbstractSampleTest {
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Test
-    public void testSanity() {
-        this.restTemplate.getForObject("/graphql/schema.json", String.class);
-    }
-
-    @Test
-    public void testRequestScope() {
-        String requestGraphQL = request(5, null);
-        ResponseEntity<JsonNode> response = sendGraphQlRequest(requestGraphQL);
-        JsonNode connection = response.getBody().get("data").get("findAll");
-        ArrayNode arrayNode = (ArrayNode) connection.get("edges");
-        List<JsonNode> nodes = arrayNode.findValues("node");
-
-        assertEquals(5, nodes.size());
-        assertEquals("Cat 0", nodes.get(0).get("name").asText());
-
-        requestGraphQL = request(5, connection.get("pageInfo").get("endCursor").asText());
-        response = sendGraphQlRequest(requestGraphQL);
-        connection = response.getBody().get("data").get("findAll");
-        arrayNode = (ArrayNode) connection.get("edges");
-        nodes = arrayNode.findValues("node");
-
-        assertEquals(5, nodes.size());
-        assertEquals("Cat 5", nodes.get(0).get("name").asText());
-    }
-
-    @Test
-    public void testCreate() {
-        String requestGraphQL = "mutation {\n" +
-                "  createCat(\n" +
-                "    cat: {\n" +
-                "      name: \"Test\"\n" +
-                "      age: 1\n" +
-                "      owner: {id: 1}\n" +
-                "      kittens: [\n" +
-                "        { name: \"Kitten 1\", age: 1, owner: {id: 1}}\n" +
-                "      ]\n" +
-                "  \t}\n" +
-                "  )\n" +
-                "}";
-        ResponseEntity<JsonNode> response = sendGraphQlRequest(requestGraphQL);
-        int id = response.getBody().get("data").get("createCat").asInt();
-
-        requestGraphQL = "query { catById(id: " + id + ") { name } }";
-        response = sendGraphQlRequest(requestGraphQL);
-
-        String name = response.getBody().get("data").get("catById").get("name").asText();
-        assertEquals("Test", name);
-    }
-
-    @Test
-    public void shouldFindAllWithTypeName() {
-        String requestGraphQL =  "query { "
-          + "  findAll(first: 3) { "
-          + "    edges { "
-          + "      node {  "
-          + "        id,"
-          + "        name,"
-          + "        __typename,"
-          + "      }"
-          + "    }"
-          + "  }"
-          + "}";
-          ResponseEntity<JsonNode> response = sendGraphQlRequest(requestGraphQL);
-          List<JsonNode> nodes = getResponseNodes(response);
-          nodes.forEach(node -> {
-              assertThat(node.get("id")).isNotNull();
-              assertThat(node.get("name").asText()).contains("Cat");
-              assertThat(node.get("__typename").asText()).isEqualTo("CatWithOwnerView");
-          });
-    }
-
-    @Test
-    public void shouldFindAllWithOutTypeName() {
-        String requestGraphQL =  "query { "
-          + "  findAll(first: 3) { "
-          + "    edges { "
-          + "      node {  "
-          + "        id,"
-          + "        name,"
-          + "      }"
-          + "    }"
-          + "  }"
-          + "}";
-        ResponseEntity<JsonNode> response = sendGraphQlRequest(requestGraphQL);
-        List<JsonNode> nodes = getResponseNodes(response);
-        nodes.forEach(node -> {
-          assertThat(node.get("id")).isNotNull();
-          assertThat(node.get("name").asText()).contains("Cat");
-        });
-    }
-
-    private List<JsonNode> getResponseNodes(ResponseEntity<JsonNode> response ) {
-        JsonNode connection = response.getBody().get("data").get("findAll");
-        ArrayNode arrayNode = (ArrayNode) connection.get("edges");
-        return arrayNode.findValues("node");
-    }
-
-    private ResponseEntity<JsonNode> sendGraphQlRequest(String query) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("content-type", "application/graphql");
-        return this.restTemplate.postForEntity("/graphql", new HttpEntity<>(query, headers), JsonNode.class);
-    }
-
-    static String request(int first, String after) {
-        String other = "";
-        if (after != null) {
-            other = ", after: \"" + after + "\"";
-        }
-        String requestGraphQL = "query {\n" +
-                "  findAll(first: " + first + other + "){\n" +
-                "    edges {\n" +
-                "      node {\n" +
-                "        id\n" +
-                "        name\n" +
-                "      }\n" +
-                "    }\n" +
-                "    pageInfo {\n" +
-                "      startCursor\n" +
-                "      endCursor\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-        return requestGraphQL;
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/config/BlazePersistenceConfiguration.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/config/BlazePersistenceConfiguration.java
deleted file mode 100644
index c55eb8ca06..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/config/BlazePersistenceConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.config;
-
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.spring.data.repository.config.EnableBlazeRepositories;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@Configuration
-@EnableEntityViews(basePackages = {"com.blazebit.persistence.integration.graphql.dgs.view"})
-@EnableBlazeRepositories(
-        basePackages = "com.blazebit.persistence.integration.graphql.dgs.repository")
-public class BlazePersistenceConfiguration {
-
-    @PersistenceUnit
-    private EntityManagerFactory entityManagerFactory;
-
-    @Bean
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
-    @Lazy(false)
-    public CriteriaBuilderFactory createCriteriaBuilderFactory() {
-        CriteriaBuilderConfiguration config = Criteria.getDefault();
-        return config.createCriteriaBuilderFactory(entityManagerFactory);
-    }
-
-    @Bean
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
-    @Lazy(false)
-    public EntityViewManager createEntityViewManager(CriteriaBuilderFactory cbf, EntityViewConfiguration entityViewConfiguration) {
-        return entityViewConfiguration.createEntityViewManager(cbf);
-    }
-}
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/fetcher/CatGraphQLApi.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/fetcher/CatGraphQLApi.java
deleted file mode 100644
index 6cf58a7556..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/fetcher/CatGraphQLApi.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.fetcher;
-
-import com.blazebit.persistence.integration.graphql.dgs.repository.CatViewRepository;
-import com.blazebit.persistence.integration.graphql.dgs.view.CatCreateView;
-import com.blazebit.persistence.integration.graphql.dgs.view.CatWithOwnerView;
-import com.blazebit.persistence.integration.graphql.GraphQLEntityViewSupport;
-import com.blazebit.persistence.integration.graphql.GraphQLRelayConnection;
-import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.Sorters;
-import com.netflix.graphql.dgs.*;
-import graphql.schema.DataFetchingEnvironment;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Collections;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@DgsComponent
-public class CatGraphQLApi {
-
-    @Autowired
-    CatViewRepository repository;
-    @Autowired
-    GraphQLEntityViewSupport graphQLEntityViewSupport;
-
-    @DgsQuery
-    public CatWithOwnerView catById(@InputArgument("id") Long id, DataFetchingEnvironment dataFetchingEnvironment) {
-        return repository.findById(graphQLEntityViewSupport.createSetting(dataFetchingEnvironment), id);
-    }
-
-    @DgsQuery
-    public GraphQLRelayConnection<CatWithOwnerView> findAll(DataFetchingEnvironment dataFetchingEnvironment) {
-        EntityViewSetting<CatWithOwnerView, ?> setting = graphQLEntityViewSupport.createPaginatedSetting(dataFetchingEnvironment);
-        setting.addAttributeSorter("id", Sorters.ascending());
-        if (setting.getMaxResults() == 0) {
-            return new GraphQLRelayConnection<>(Collections.emptyList());
-        }
-        return new GraphQLRelayConnection<>(repository.findAll(setting));
-    }
-
-    @DgsMutation
-    public Long createCat(@InputArgument(name = "cat") CatCreateView cat) {
-        repository.save(cat);
-        return cat.getId();
-    }
-
-    // Even though the CatWithOwnerView type will have a field for the name "theData",
-    // the DGS runtime can't access the field through the "abc" method,
-    // so we need to add dedicated DataFetcher here
-
-    @DgsData(parentType = "CatWithOwnerView", field = "theData")
-    public String getData(DataFetchingEnvironment dataFetchingEnvironment) {
-        Object source = dataFetchingEnvironment.getSource();
-        if (source instanceof CatWithOwnerView) {
-            return ((CatWithOwnerView) source).abc();
-        }
-        return null;
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Cat.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Cat.java
deleted file mode 100644
index 12e7fdd980..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Cat.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@Entity
-public class Cat {
-
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    private Integer age;
-    @JsonIgnoreProperties("kittens")
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Person owner;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat mother;
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
-    private Cat father;
-    @Convert(converter = ListStringConverter.class)
-    private List<String> nicknames;
-    @JsonIgnore
-    @ManyToMany
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Cat() {
-    }
-
-    public Cat(String name, Integer age, Person owner) {
-        this.name = name;
-        this.age = age;
-        this.owner = owner;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-
-    public Cat getMother() {
-        return mother;
-    }
-
-    public void setMother(Cat mother) {
-        this.mother = mother;
-    }
-
-    public Cat getFather() {
-        return father;
-    }
-
-    public void setFather(Cat father) {
-        this.father = father;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/ListStringConverter.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/ListStringConverter.java
deleted file mode 100644
index f1d34a6223..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/ListStringConverter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.model;
-
-import javax.persistence.AttributeConverter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.6.8
- */
-public class ListStringConverter implements AttributeConverter<List<String>, String> {
-
-    @Override
-    public String convertToDatabaseColumn(List<String> strings) {
-        if (strings == null) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (String string : strings) {
-            sb.append(string).append(',');
-        }
-        sb.setLength(sb.length() - 1);
-        return sb.toString();
-    }
-
-    @Override
-    public List<String> convertToEntityAttribute(String s) {
-        if (s == null) {
-            return null;
-        }
-        String[] strings = s.split("\\.");
-        List<String> list = new ArrayList<>(strings.length);
-        for (String element : strings) {
-            list.add(element);
-        }
-        return list;
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Person.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Person.java
deleted file mode 100644
index 022afe2b0a..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/model/Person.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@Entity
-public class Person {
-
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String name;
-    @OneToMany(mappedBy = "owner")
-    private Set<Cat> kittens = new HashSet<>();
-
-    public Person() {
-    }
-
-    public Person(String name) {
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<Cat> getKittens() {
-        return kittens;
-    }
-
-    public void setKittens(Set<Cat> kittens) {
-        this.kittens = kittens;
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatJpaRepository.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatJpaRepository.java
deleted file mode 100644
index 513f1449fb..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatJpaRepository.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.repository;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-public interface CatJpaRepository extends JpaRepository<Cat, Long> {
-
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatViewRepository.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatViewRepository.java
deleted file mode 100644
index fd566ef8d5..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/repository/CatViewRepository.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.repository;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@Component
-public class CatViewRepository {
-
-    @Autowired
-    EntityManager em;
-    @Autowired
-    CriteriaBuilderFactory cbf;
-    @Autowired
-    EntityViewManager evm;
-
-    public <T> T findById(EntityViewSetting<T, CriteriaBuilder<T>> setting, Long id) {
-        return evm.find(em, setting, id);
-    }
-
-    public <T> List<T> findAll(EntityViewSetting<T, ?> setting) {
-        return evm.applySetting(setting, cbf.create(em, evm.getMetamodel().managedView(setting.getEntityViewClass()).getEntityClass())).getResultList();
-    }
-
-    @Transactional
-    public void save(Object o) {
-        evm.save(em, o);
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatCreateView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatCreateView.java
deleted file mode 100644
index 0904090665..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatCreateView.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@CreatableEntityView
-@EntityView(Cat.class)
-public interface CatCreateView extends CatSimpleCreateView {
-
-    Set<CatSimpleCreateView> getKittens();
-    void setKittens(Set<CatSimpleCreateView> kittens);
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleCreateView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleCreateView.java
deleted file mode 100644
index bda127731f..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleCreateView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@CreatableEntityView
-@EntityView(Cat.class)
-public interface CatSimpleCreateView extends CatUpdateView {
-
-    PersonIdView getOwner();
-
-    void setOwner(PersonIdView owner);
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleView.java
deleted file mode 100644
index 8eee76e14a..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatSimpleView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@EntityView(Cat.class)
-public interface CatSimpleView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatUpdateView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatUpdateView.java
deleted file mode 100644
index a08e3ceaeb..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatUpdateView.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.UpdatableEntityView;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@UpdatableEntityView
-@EntityView(Cat.class)
-public interface CatUpdateView extends CatSimpleView {
-
-    void setName(String name);
-
-    Integer getAge();
-
-    void setAge(Integer age);
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatWithOwnerView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatWithOwnerView.java
deleted file mode 100644
index b30c1a9c75..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/CatWithOwnerView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Cat;
-import com.blazebit.persistence.integration.graphql.GraphQLName;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.MappingSingular;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@EntityView(Cat.class)
-public interface CatWithOwnerView extends CatSimpleView {
-
-    PersonSimpleView getOwner();
-
-    @MappingSingular
-    List<String> getNicknames();
-
-    @GraphQLName("theData")
-    default String abc() {
-        return "def";
-    }
-    default String getSampleData() {
-        return "abc";
-    }
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonIdView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonIdView.java
deleted file mode 100644
index 08b40328df..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonIdView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Person;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@EntityView(Person.class)
-public interface PersonIdView {
-
-    @IdMapping
-    Long getId();
-
-}
diff --git a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonSimpleView.java b/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonSimpleView.java
deleted file mode 100644
index 4babd2ec08..0000000000
--- a/integration/graphql-dgs/src/test/java/com/blazebit/persistence/integration/graphql/dgs/view/PersonSimpleView.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.graphql.dgs.view;
-
-import com.blazebit.persistence.integration.graphql.dgs.model.Person;
-import com.blazebit.persistence.view.EntityView;
-
-/**
- * @author Christian Beikov
- * @since 1.6.2
- */
-@EntityView(Person.class)
-public interface PersonSimpleView extends PersonIdView {
-
-    String getName();
-
-}
diff --git a/integration/graphql-dgs/src/test/resources/META-INF/test-config.xml b/integration/graphql-dgs/src/test/resources/META-INF/test-config.xml
deleted file mode 100644
index 6620f7e6e3..0000000000
--- a/integration/graphql-dgs/src/test/resources/META-INF/test-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
-
-    <bean id="mvcConversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
-
-</beans>
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/test/resources/application.properties b/integration/graphql-dgs/src/test/resources/application.properties
deleted file mode 100644
index a05ffcb235..0000000000
--- a/integration/graphql-dgs/src/test/resources/application.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-server.contextPath=/
-spring.h2.console.enabled=true
-spring.jpa.show-sql=true
-#logging.level.org.hibernate.SQL=DEBUG
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jackson.serialization.fail-on-empty-beans=false
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/test/resources/logback-test.xml b/integration/graphql-dgs/src/test/resources/logback-test.xml
deleted file mode 100644
index 0f318994b6..0000000000
--- a/integration/graphql-dgs/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <logger name="org.springframework.core " level="error" />
-    <logger name="org.springframework.beans" level="error" />
-    <logger name="org.springframework.context" level="error" />
-    <logger name="org.springframework.transaction" level="error" />
-    <logger name="org.springframework.web" level="error" />
-    <logger name="org.springframework.test" level="error" />
-    <logger name="org.hibernate" level="error" />
-<!--    <logger name="org.hibernate.SQL" level="debug" />-->
-</configuration>
\ No newline at end of file
diff --git a/integration/graphql-dgs/src/test/resources/schema/schema.graphqls b/integration/graphql-dgs/src/test/resources/schema/schema.graphqls
deleted file mode 100644
index 4ee0fe22df..0000000000
--- a/integration/graphql-dgs/src/test/resources/schema/schema.graphqls
+++ /dev/null
@@ -1,10 +0,0 @@
-type Query {
-    catById(id: Long!): CatWithOwnerView
-    findAll(first: Int, last:Int, offset: Int, before: String, after: String): CatWithOwnerViewConnection!
-}
-
-type Mutation {
-    createCat(cat: CatCreateViewInput): Int
-}
-
-scalar Long
\ No newline at end of file
diff --git a/integration/graphql-jakarta/pom.xml b/integration/graphql-jakarta/pom.xml
deleted file mode 100644
index 932d8cea2c..0000000000
--- a/integration/graphql-jakarta/pom.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.graphql</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.graphql-java</groupId>
-            <artifactId>graphql-java</artifactId>
-            <version>17.3</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-graphql:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-graphql:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-graphql:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/graphql-spqr-jakarta/pom.xml b/integration/graphql-spqr-jakarta/pom.xml
deleted file mode 100644
index bb3c065937..0000000000
--- a/integration/graphql-spqr-jakarta/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-graphql-spqr-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.graphql.spqr</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-spqr</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-graphql-spqr:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-graphql-spqr:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-graphql-spqr:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/graphql-spqr/pom.xml b/integration/graphql-spqr/pom.xml
index 78acaf902e..c8b8a7c1f8 100644
--- a/integration/graphql-spqr/pom.xml
+++ b/integration/graphql-spqr/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,16 +14,41 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.graphql.spqr</module.name>
-        <main.java.version>1.8</main.java.version>
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-        <version.hibernate>${version.hibernate-5.6}</version.hibernate>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring.boot>${version.spring-data-3.3-spring-boot}</version.spring.boot>
+        <version.spring.data>${version.spring-data-3.3}</version.spring.data>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-graphql</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -36,7 +61,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -48,7 +72,7 @@
         <dependency>
             <groupId>io.leangen.graphql</groupId>
             <artifactId>graphql-spqr-spring-boot-starter</artifactId>
-            <version>0.0.7</version>
+            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -75,6 +99,39 @@
             <version>${version.spring.boot}</version>
             <scope>test</scope>
         </dependency>
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -88,15 +145,15 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-apt}</version>
             <scope>test</scope>
         </dependency>
 
@@ -104,7 +161,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.7}</version>
+            <version>${version.spring.data}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -115,12 +172,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -130,12 +187,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit-vintage}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -165,7 +216,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -186,28 +237,18 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.integration.graphql;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${version.junit-vintage}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/integration/graphql-spqr/src/main/java/module-info.java b/integration/graphql-spqr/src/main/java/module-info.java
new file mode 100644
index 0000000000..152926ff27
--- /dev/null
+++ b/integration/graphql-spqr/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.graphql.spqr {
+	requires com.blazebit.persistence.integration.jackson;
+	requires com.blazebit.persistence.integration.graphql;
+	requires com.fasterxml.jackson.databind;
+	requires spqr;
+	requires spring.boot.autoconfigure;
+	requires spring.context;
+	requires spring.web;
+	exports com.blazebit.persistence.integration.graphql.spqr;
+	opens com.blazebit.persistence.integration.graphql.spqr to spring.core;
+}
\ No newline at end of file
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/AbstractSampleTest.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/AbstractSampleTest.java
index 6c7c7b6d7d..42ebdfb4ad 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/AbstractSampleTest.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/AbstractSampleTest.java
@@ -12,7 +12,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/Application.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/Application.java
index 2ff09a2c5c..59175ba772 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/Application.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/Application.java
@@ -15,7 +15,7 @@
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/BlazePersistenceConfiguration.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/BlazePersistenceConfiguration.java
index 008941c2f4..b88de4a5fa 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/BlazePersistenceConfiguration.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/BlazePersistenceConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 
 /**
  * @author Christian Beikov
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/SpqrConfiguration.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/SpqrConfiguration.java
index 237ded2b8e..5633a48401 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/SpqrConfiguration.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/config/SpqrConfiguration.java
@@ -24,7 +24,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.util.Collection;
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Cat.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Cat.java
index fbe5d4c75d..1c7dd09d9d 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Cat.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Cat.java
@@ -8,12 +8,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Person.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Person.java
index 90d55acfec..aa445d8216 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Person.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/model/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.integration.graphql.spqr.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/repository/CatViewRepository.java b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/repository/CatViewRepository.java
index 7c051a7565..cac1da03c1 100644
--- a/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/repository/CatViewRepository.java
+++ b/integration/graphql-spqr/src/test/java/com/blazebit/persistence/integration/graphql/spqr/repository/CatViewRepository.java
@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 /**
diff --git a/integration/graphql/pom.xml b/integration/graphql/pom.xml
index 9dd295c815..8b89779698 100644
--- a/integration/graphql/pom.xml
+++ b/integration/graphql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,10 +14,34 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.graphql</module.name>
-        <main.java.version>1.8</main.java.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-parser</artifactId>
@@ -46,12 +70,6 @@
             <version>17.3</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -80,30 +98,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.integration.graphql;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/integration/graphql/src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportFactory.java b/integration/graphql/src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportFactory.java
index 3ebcd01ce4..6d05e3630f 100644
--- a/integration/graphql/src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportFactory.java
+++ b/integration/graphql/src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportFactory.java
@@ -444,7 +444,7 @@ public GraphQLEntityViewSupport create(TypeDefinitionRegistry typeRegistry, Enti
         }
 
         Set<String> serializableBasicTypes = new HashSet<>();
-        for (javax.persistence.metamodel.Type<?> basicType : entityMetamodel.getBasicTypes()) {
+        for (jakarta.persistence.metamodel.Type<?> basicType : entityMetamodel.getBasicTypes()) {
             for (Class<?> superType : ReflectionUtils.getSuperTypes(basicType.getJavaType())) {
                 serializableBasicTypes.add(superType.getName());
             }
@@ -632,7 +632,7 @@ public GraphQLEntityViewSupport create(GraphQLSchema.Builder schemaBuilder, Enti
         }
 
         Set<String> serializableBasicTypes = new HashSet<>();
-        for (javax.persistence.metamodel.Type<?> basicType : entityMetamodel.getBasicTypes()) {
+        for (jakarta.persistence.metamodel.Type<?> basicType : entityMetamodel.getBasicTypes()) {
             for (Class<?> superType : ReflectionUtils.getSuperTypes(basicType.getJavaType())) {
                 serializableBasicTypes.add(superType.getName());
             }
@@ -1920,7 +1920,7 @@ protected GraphQLOutputType getScalarType(GraphQLSchema.Builder schemaBuilder, C
     protected boolean isNotNull(SingularAttribute<?, ?> attribute, EntityMetamodel entityMetamodel) {
         if (attribute instanceof MappingAttribute<?, ?> && !attribute.isQueryParameter()) {
             AbstractAttribute<?, ?> attr = (AbstractAttribute<?, ?>) attribute;
-            Map<String, javax.persistence.metamodel.Type<?>> rootTypes = attr.getDeclaringType().getEntityViewRootTypes();
+            Map<String, jakarta.persistence.metamodel.Type<?>> rootTypes = attr.getDeclaringType().getEntityViewRootTypes();
             if (rootTypes.isEmpty()) {
                 rootTypes = Collections.singletonMap("this", attr.getDeclaringType().getJpaManagedType());
             } else {
@@ -1963,7 +1963,6 @@ protected boolean isNotNull(Annotation[] annotations) {
                 case "com.blazebit.persistence.integration.graphql.GraphQLNonNull":
                 case "io.leangen.graphql.annotations.GraphQLNonNull":
                 // Also respect common NonNull language annotations
-                case "javax.validation.constraints.NotNull":
                 case "jakarta.validation.constraints.NotNull":
                 case "org.springframework.lang.NonNull":
                 case "lombok.NonNull":
diff --git a/integration/graphql/src/main/java/module-info.java b/integration/graphql/src/main/java/module-info.java
new file mode 100644
index 0000000000..b161d640ad
--- /dev/null
+++ b/integration/graphql/src/main/java/module-info.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.graphql {
+	requires com.graphqljava;
+	requires com.blazebit.persistence.core.parser;
+	requires com.blazebit.persistence.view.impl;
+	requires com.blazebit.persistence.view;
+	requires com.blazebit.persistence.core.impl;
+	requires com.blazebit.common.utils;
+	requires jakarta.persistence;
+	exports com.blazebit.persistence.integration.graphql;
+}
\ No newline at end of file
diff --git a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Animal.java b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Animal.java
index a1f77f462b..0f9c8693f7 100644
--- a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Animal.java
+++ b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Animal.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.graphql.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 /**
  * @author Christian Beikov
diff --git a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Cat.java b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Cat.java
index daebf8d2a5..2932b54984 100644
--- a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Cat.java
+++ b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Cat.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.integration.graphql.entities;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  * @author Christian Beikov
diff --git a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Document.java b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Document.java
index 5082c85d53..0b3b949bdb 100644
--- a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Document.java
+++ b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Document.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.graphql.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Person.java b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Person.java
index 23399d8c7d..bbfc7e3ea0 100644
--- a/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Person.java
+++ b/integration/graphql/src/test/java/com/blazebit/persistence/integration/graphql/entities/Person.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.graphql.entities;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/hibernate-4.2/.gitignore b/integration/hibernate-4.2/.gitignore
deleted file mode 100644
index 1dd3331081..0000000000
--- a/integration/hibernate-4.2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/target/
diff --git a/integration/hibernate-4.2/pom.xml b/integration/hibernate-4.2/pom.xml
deleted file mode 100644
index 8240e3b1bd..0000000000
--- a/integration/hibernate-4.2/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 4.2</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <!-- Minimum version is 4.2.8.Final -->
-            <!-- 4.2.15.Final has a bug regarding naming strategies -->
-            <version>4.2.14.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate4Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate42EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate4TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate4Integrator;
-                                        provides org.hibernate.metamodel.spi.TypeContributor with com.blazebit.persistence.integration.hibernate.Hibernate4Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index d421efacf4..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.OneToMany;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.ToOne;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    private final String mappedByProperty;
-
-    public CustomBasicCollectionPersister(Collection collection, CollectionRegionAccessStrategy cacheAccessStrategy, Configuration cfg, SessionFactoryImplementor factory) throws MappingException, CacheException {
-        super(collection, cacheAccessStrategy, cfg, factory);
-        String referencedPropertyName = collection.getReferencedPropertyName();
-        if (referencedPropertyName == null && collection.isInverse()) {
-            referencedPropertyName = findMappedByProperty(collection);
-        }
-        this.mappedByProperty = referencedPropertyName;
-    }
-
-    @SuppressWarnings("unchecked")
-    private String findMappedByProperty(Collection collection) {
-        String ownerEntityName = collection.getOwnerEntityName();
-        Iterator<Column> columnIterator = collection.getKey().getColumnIterator();
-        List<String> columnNames = new ArrayList<>();
-        while (columnIterator.hasNext()) {
-            Column column = columnIterator.next();
-            columnNames.add(column.getName());
-        }
-
-        OneToMany oneToMany = (OneToMany) collection.getElement();
-        Iterator propertyIterator = oneToMany.getAssociatedClass().getPropertyIterator();
-        while (propertyIterator.hasNext()) {
-            Property property = (Property) propertyIterator.next();
-            if (property.getValue() instanceof ToOne) {
-                ToOne toOne = (ToOne) property.getValue();
-                if (ownerEntityName.equals(toOne.getReferencedEntityName())
-                        && matches(columnNames, collection.getKey().getColumnIterator())) {
-                    return property.getName();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private boolean matches(List<String> columns, Iterator<Column> iter) {
-        for (int i = 0; iter.hasNext(); i++) {
-            Column column = iter.next();
-            if (i == columns.size() || !columns.get(i).equals(column.getName())) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public String getMappedByProperty() {
-        return mappedByProperty;
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectCollectionLoader(
-                this,
-                SubselectLoaderUtils.getSubselectQueryForHibernatePre5(subselect.toSubselectString(getCollectionType().getLHSPropertyName())),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index 494731c744..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.cfg.Mappings;
-import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.Mapping;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess jdbcConnectionAccess, Mappings mappings, Mapping mapping, Map map) {
-        delegate.prepare(jdbcServices, jdbcConnectionAccess, mappings, mapping, map);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess jdbcConnectionAccess) {
-        delegate.release(jdbcServices, jdbcConnectionAccess);
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index 7a31095a5e..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Component;
-import org.hibernate.mapping.OneToMany;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.ToOne;
-import org.hibernate.persister.collection.OneToManyPersister;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    private final String mappedByProperty;
-
-    public CustomOneToManyPersister(Collection collection, CollectionRegionAccessStrategy cacheAccessStrategy, Configuration cfg, SessionFactoryImplementor factory) throws MappingException, CacheException {
-        super(collection, cacheAccessStrategy, cfg, factory);
-        String referencedPropertyName = collection.getReferencedPropertyName();
-        if (referencedPropertyName == null && collection.isInverse()) {
-            referencedPropertyName = findMappedByProperty(collection);
-        }
-        this.mappedByProperty = referencedPropertyName;
-    }
-
-    @SuppressWarnings("unchecked")
-    private String findMappedByProperty(Collection collection) {
-        String ownerEntityName = collection.getOwnerEntityName();
-        Iterator<Column> columnIterator = collection.getKey().getColumnIterator();
-        List<String> columnNames = new ArrayList<>();
-        while (columnIterator.hasNext()) {
-            Column column = columnIterator.next();
-            columnNames.add(column.getName());
-        }
-
-        OneToMany oneToMany = (OneToMany) collection.getElement();
-        return findMappedByProperty(collection, ownerEntityName, columnNames, oneToMany.getAssociatedClass().getPropertyIterator());
-    }
-
-    private String findMappedByProperty(Collection collection, String ownerEntityName, List<String> columnNames, Iterator propertyIterator) {
-        while (propertyIterator.hasNext()) {
-            Property property = (Property) propertyIterator.next();
-            if (property.getValue() instanceof Component) {
-                String name = findMappedByProperty(collection, ownerEntityName, columnNames, ((Component) property.getValue()).getPropertyIterator());
-                if (name != null) {
-                    return property.getName() + "." + name;
-                }
-            } else if (property.getValue() instanceof ToOne) {
-                ToOne toOne = (ToOne) property.getValue();
-                if (ownerEntityName.equals(toOne.getReferencedEntityName())
-                        && matches(columnNames, collection.getKey().getColumnIterator())) {
-                    return property.getName();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private boolean matches(List<String> columns, Iterator<Column> iter) {
-        for (int i = 0; iter.hasNext(); i++) {
-            Column column = iter.next();
-            if (i == columns.size() || !columns.get(i).equals(column.getName())) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public String getMappedByProperty() {
-        return mappedByProperty;
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                SubselectLoaderUtils.getSubselectQueryForHibernatePre5(subselect.toSubselectString(getCollectionType().getLHSPropertyName())),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index e185b1e43e..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index 40cf98392f..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index fa115bcf1a..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.transaction.spi.TransactionCoordinator;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(final SessionImplementor session, QueryParameters queryParameters) {
-        TransactionCoordinator transactionCoordinator = session.getTransactionCoordinator();
-        final JdbcCoordinator jdbcCoordinator = transactionCoordinator.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        Object transactionCoordinatorProxy = Proxy.newProxyInstance(transactionCoordinator.getClass().getClassLoader(), new Class[]{ TransactionCoordinator.class }, new Hibernate4TransactionCoordinatorInvocationHandler(transactionCoordinator, jdbcCoordinatorProxy));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{SessionImplementor.class, EventSource.class}, new Hibernate4SessionInvocationHandler(session, transactionCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate42EntityManagerFactoryIntegrator.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate42EntityManagerFactoryIntegrator.java
deleted file mode 100644
index 3e741564d2..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate42EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpaProvider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.ejb.HibernateEntityManagerFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate42EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        EntityManager em = null;
-
-        try {
-            em = entityManagerFactory.createEntityManager();
-            return getDbms(em);
-        } finally {
-            if (em != null) {
-                em.close();
-            }
-        }
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        return new HibernateJpaProvider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpaProvider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java
deleted file mode 100644
index 4b7fe4899e..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Access.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.reflection.ReflectionUtils;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.ejb.HibernateEntityManagerImplementor;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.query.spi.ParameterMetadata;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.engine.transaction.spi.TransactionCoordinator;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.internal.classic.ParserHelper;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.logging.Logger;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate4Access implements HibernateAccess {
-
-    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
-    private static final Method DO_EXECUTE_METHOD;
-
-    static {
-        try {
-            Method m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SessionImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-            DO_EXECUTE_METHOD = m;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        TransactionCoordinator transactionCoordinator = session.getTransactionCoordinator();
-        JdbcCoordinator jdbcCoordinator = transactionCoordinator.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object transactionCoordinatorProxy = Proxy.newProxyInstance(transactionCoordinator.getClass().getClassLoader(), new Class[]{ TransactionCoordinator.class }, new Hibernate4TransactionCoordinatorInvocationHandler(transactionCoordinator, jdbcCoordinatorProxy));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate4SessionInvocationHandler(session, transactionCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate4LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate4SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        coordinator.getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            coordinator.getJdbcCoordinator().afterTransaction();
-        }
-        coordinator.getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Object performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResults scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((org.hibernate.internal.AbstractQueryImpl) hibernateQuery).getQueryParameters(namedParams);
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameters");
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        String query = hibernateQuery.getQueryString();
-        ParameterMetadata parameterMetadata = getParameterMetadata(hibernateQuery);
-        Iterator<Map.Entry<String, TypedValue>> iter = getNamedParamLists(hibernateQuery).entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, TypedValue> me = iter.next();
-            query = expandParameterList(session, parameterMetadata, query, (String) me.getKey(), (TypedValue) me.getValue(), namedParamsCopy);
-        }
-        return query;
-    }
-
-    private ParameterMetadata getParameterMetadata(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "parameterMetadata");
-    }
-
-    private Map<String, TypedValue> getNamedParamLists(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameterLists");
-    }
-
-    private String expandParameterList(SessionImplementor session, ParameterMetadata parameterMetadata, String query, String name, TypedValue typedList, Map<String, TypedValue> namedParamsCopy) {
-        Collection<?> vals = (Collection<?>) typedList.getValue();
-
-        // HHH-1123
-        // Some DBs limit number of IN expressions.  For now, warn...
-        final Dialect dialect = session.getFactory().getDialect();
-        final int inExprLimit = dialect.getInExpressionCountLimit();
-        if (inExprLimit > 0 && vals.size() > inExprLimit) {
-            LOG.warning(String.format("Dialect [%s] limits the number of elements in an IN predicate to %s entries.  " +
-                    "However, the given parameter list [%s] contained %s entries, which will likely cause failures " +
-                    "to execute the query in the database", dialect.getClass().getName(), inExprLimit, name, vals.size()));
-        }
-
-        Type type = typedList.getType();
-
-        boolean isJpaPositionalParam = parameterMetadata.getNamedParameterDescriptor(name).isJpaStyle();
-        String paramPrefix = isJpaPositionalParam ? "?" : ParserHelper.HQL_VARIABLE_PREFIX;
-        String placeholder =
-                new StringBuilder(paramPrefix.length() + name.length())
-                        .append(paramPrefix).append(name)
-                        .toString();
-
-        if (query == null) {
-            return query;
-        }
-        int loc = query.indexOf(placeholder);
-
-        if (loc < 0) {
-            return query;
-        }
-
-        String beforePlaceholder = query.substring(0, loc);
-        String afterPlaceholder =  query.substring(loc + placeholder.length());
-
-        // check if placeholder is already immediately enclosed in parentheses
-        // (ignoring whitespace)
-        boolean isEnclosedInParens =
-                StringHelper.getLastNonWhitespaceCharacter(beforePlaceholder) == '(' &&
-                        StringHelper.getFirstNonWhitespaceCharacter(afterPlaceholder) == ')';
-
-        if (vals.size() == 1  && isEnclosedInParens) {
-            // short-circuit for performance when only 1 value and the
-            // placeholder is already enclosed in parentheses...
-            namedParamsCopy.put(name, new TypedValue(type, vals.iterator().next()));
-            return query;
-        }
-
-        StringBuilder list = new StringBuilder(16);
-        Iterator<?> iter = vals.iterator();
-        int i = 0;
-        while (iter.hasNext()) {
-            // Variable 'name' can represent a number or contain digit at the end. Surrounding it with
-            // characters to avoid ambiguous definition after concatenating value of 'i' counter.
-            String alias = (isJpaPositionalParam ? 'x' + name : name) + '_' + i++ + '_';
-            if (namedParamsCopy.put(alias, new TypedValue(type, iter.next())) != null) {
-                throw new HibernateException("Repeated usage of alias '" + alias + "' while expanding list parameter.");
-            }
-            list.append(ParserHelper.HQL_VARIABLE_PREFIX).append(alias);
-            if (iter.hasNext()) {
-                list.append(", ");
-            }
-        }
-        return StringHelper.replace(
-                beforePlaceholder,
-                afterPlaceholder,
-                placeholder.toString(),
-                list.toString(),
-                true,
-                true
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T getField(Object object, String field) {
-        boolean madeAccessible = false;
-        Field f = null;
-        try {
-            f = ReflectionUtils.getField(object.getClass(), field);
-            madeAccessible = !f.isAccessible();
-
-            if (madeAccessible) {
-                f.setAccessible(true);
-            }
-            return (T) f.get(object);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        } finally {
-            if (madeAccessible) {
-                f.setAccessible(false);
-            }
-        }
-    }
-
-    private HibernateEntityManagerImplementor getEntityManager(EntityManager em) {
-        return (HibernateEntityManagerImplementor) em.unwrap(EntityManager.class);
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getEntityManager(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getEntityManager(em).handlePersistenceException(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getEntityManager(em).throwPersistenceException(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        return new ParameterTranslationsImpl(queryParameterSpecifications);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4DelegatingDialect.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4DelegatingDialect.java
deleted file mode 100644
index e28470a7b4..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4DelegatingDialect.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.metamodel.spi.TypeContributions;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate4DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public boolean supportsIdentityColumns() {
-        return delegate.supportsIdentityColumns();
-    }
-
-    @Override
-    public boolean supportsInsertSelectIdentity() {
-        return delegate.supportsInsertSelectIdentity();
-    }
-
-    @Override
-    public boolean hasDataTypeInIdentityColumn() {
-        return delegate.hasDataTypeInIdentityColumn();
-    }
-
-    @Override
-    public String appendIdentitySelectToInsert(String insertString) {
-        return delegate.appendIdentitySelectToInsert(insertString);
-    }
-
-    @Override
-    public String getIdentitySelectString(String table, String column, int type) throws MappingException {
-        return delegate.getIdentitySelectString(table, column, type);
-    }
-
-    @Override
-    public String getIdentityColumnString(int type) throws MappingException {
-        return delegate.getIdentityColumnString(type);
-    }
-
-    @Override
-    public String getIdentityInsertString() {
-        return delegate.getIdentityInsertString();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public LimitHandler buildLimitHandler(String sql, RowSelection selection) {
-        return delegate.buildLimitHandler(sql, selection);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public boolean supportsTemporaryTables() {
-        return delegate.supportsTemporaryTables();
-    }
-
-    @Override
-    public String generateTemporaryTableName(String baseTableName) {
-        return delegate.generateTemporaryTableName(baseTableName);
-    }
-
-    @Override
-    public String getCreateTemporaryTableString() {
-        return delegate.getCreateTemporaryTableString();
-    }
-
-    @Override
-    public String getCreateTemporaryTablePostfix() {
-        return delegate.getCreateTemporaryTablePostfix();
-    }
-
-    @Override
-    public String getDropTemporaryTableString() {
-        return delegate.getDropTemporaryTableString();
-    }
-
-    @Override
-    public Boolean performTemporaryTableDDLInIsolation() {
-        return delegate.performTemporaryTableDDLInIsolation();
-    }
-
-    @Override
-    public boolean dropTemporaryTableAfterUse() {
-        return delegate.dropTemporaryTableAfterUse();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public boolean requiresParensForTupleDistinctCounts() {
-        return delegate.requiresParensForTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Integrator.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Integrator.java
deleted file mode 100644
index 14463e71dc..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4Integrator.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.SimpleTableNameFormatter;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.spi.PersistentTableBulkIdStrategy;
-import org.hibernate.hql.spi.TemporaryTableBulkIdStrategy;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.ServiceContributingIntegrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.metamodel.source.MetadataImplementor;
-import org.hibernate.metamodel.spi.TypeContributions;
-import org.hibernate.metamodel.spi.TypeContributor;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.Service;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
-import org.hibernate.service.spi.BasicServiceInitiator;
-import org.hibernate.service.spi.Configurable;
-import org.hibernate.service.spi.ServiceBinding;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate4Integrator implements ServiceContributingIntegrator, TypeContributor, Configurable, Service {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate4Integrator.class.getName());
-    private Map<String, Object> configuration;
-
-    @Override
-    public void configure(Map map) {
-        this.configuration = map;
-    }
-
-    @Override
-    public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        ((StandardServiceRegistryImpl) serviceRegistry).configureService(new ServiceBinding<>((ServiceBinding.ServiceLifecycleOwner) serviceRegistry, Hibernate4Integrator.class, this));
-        Object o = configuration.get("hibernate.hql.bulk_id_strategy");
-        if (o == null) {
-            serviceRegistry.getService(JdbcServices.class).getDialect().getDefaultProperties().put("hibernate.hql.bulk_id_strategy", new CustomMultiTableBulkIdStrategy(serviceRegistry.getService(JdbcServices.class).getDialect().supportsTemporaryTables() ? TemporaryTableBulkIdStrategy.INSTANCE : new PersistentTableBulkIdStrategy()));
-        } else {
-            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + o);
-        }
-    }
-
-    @Override
-    public void prepareServices(ServiceRegistryBuilder serviceRegistryBuilder) {
-        serviceRegistryBuilder.addInitiator(new BasicServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-
-    @Override
-    public void integrate(Configuration configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        Class<?> valuesEntity;
-        boolean registerValuesEntity = true;
-        try {
-            valuesEntity = Class.forName("com.blazebit.persistence.impl.function.entity.ValuesEntity");
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Are you missing blaze-persistence-core-impl on the classpath?", e);
-        }
-
-        Iterator<PersistentClass> iter = configuration.getClassMappings();
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        while (iter.hasNext()) {
-            PersistentClass clazz = iter.next();
-            Class<?> entityClass = clazz.getMappedClass();
-            if (valuesEntity.equals(entityClass)) {
-                registerValuesEntity = false;
-            }
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        if (registerValuesEntity) {
-            // Register values entity if wasn't found
-            configuration.addAnnotatedClass(valuesEntity);
-            configuration.buildMappings();
-            PersistentClass clazz = configuration.getClassMapping(valuesEntity.getName());
-            clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings(), sessionFactory.getDialect(), new SimpleTableNameFormatter(), configuration.buildMapping()));
-    }
-
-    @Override
-    public void integrate(MetadataImplementor metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandler.java
deleted file mode 100644
index 5e0a83511f..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private final String sql;
-    private final Integer limit;
-    private final Integer offset;
-
-    public Hibernate4LimitHandler(Dialect dialect, DbmsDialect dbmsDialect, String sql, RowSelection selection) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-        this.sql = sql;
-
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String getProcessedSql() {
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandlingDialect.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandlingDialect.java
deleted file mode 100644
index 06c9764942..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4LimitHandlingDialect extends Hibernate4DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate4LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler buildLimitHandler(String sql, RowSelection selection) {
-        return new Hibernate4LimitHandler(this, dbmsDialect, sql, selection);
-    }
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionFactoryInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionFactoryInvocationHandler.java
deleted file mode 100644
index 1548a22b28..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate4SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionInvocationHandler.java
deleted file mode 100644
index fd6e10b9b7..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object transactionCoordinatorProxy;
-
-    public Hibernate4SessionInvocationHandler(SessionImplementor delegate, Object transactionCoordinatorProxy) {
-        this.delegate = delegate;
-        this.transactionCoordinatorProxy = transactionCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getTransactionCoordinator".equals(method.getName())) {
-            return transactionCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java
deleted file mode 100644
index cff719331f..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Christian Beikov
- * @since 1.4.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate4TransactionAccessFactory implements TransactionAccessFactory {
-
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        return new Hibernate4TransactionSynchronizationStrategy(entityManager);
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionCoordinatorInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionCoordinatorInvocationHandler.java
deleted file mode 100644
index a753e10730..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4TransactionCoordinatorInvocationHandler implements InvocationHandler {
-    
-    private final Object delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate4TransactionCoordinatorInvocationHandler(Object delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java
deleted file mode 100644
index 02b1628076..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.transaction.spi.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4TransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate4TransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getSynchronizationRegistry();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        try {
-            synchronizationRegistry.registerSynchronization(synchronization);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index 76c46a02d2..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index f3212cf2dd..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getTransactionCoordinator().getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getTransactionCoordinator().getJdbcCoordinator().release(ps);
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index 6f2d1d62e3..0000000000
--- a/integration/hibernate-4.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.cfg.Settings;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final Settings settings() {
-        return sessionFactoryImplementor.getSettings();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return jdbcCoordinator.getTransactionCoordinator()
-            .getTransactionContext()
-            .getTransactionEnvironment()
-            .getJdbcServices()
-            .getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{ PreparedStatement.class }, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String sql) {
-            this.sql = jdbcCoordinator.getTransactionCoordinator().getTransactionContext().onPrepareStatement(sql);
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                jdbcCoordinator.getLogicalConnection().getJdbcServices().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getTransactionCoordinator().getTransactionContext().startPrepareStatement();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getTransactionCoordinator().getTransactionContext().endPrepareStatement();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.register(preparedStatement);
-            logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-4.2/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor b/integration/hibernate-4.2/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor
deleted file mode 100644
index 0f403f8f8a..0000000000
--- a/integration/hibernate-4.2/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.hibernate.Hibernate4Integrator
\ No newline at end of file
diff --git a/integration/hibernate-4.3/.gitignore b/integration/hibernate-4.3/.gitignore
deleted file mode 100644
index 1dd3331081..0000000000
--- a/integration/hibernate-4.3/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/target/
diff --git a/integration/hibernate-4.3/pom.xml b/integration/hibernate-4.3/pom.xml
deleted file mode 100644
index dfefde2bef..0000000000
--- a/integration/hibernate-4.3/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 4.3</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate43Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate43EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate4TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate43Integrator;
-                                        provides org.hibernate.metamodel.spi.TypeContributor with com.blazebit.persistence.integration.hibernate.Hibernate43Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index afaac61ffe..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    public CustomBasicCollectionPersister(Collection collection, CollectionRegionAccessStrategy cacheAccessStrategy, Configuration cfg, SessionFactoryImplementor factory) throws MappingException, CacheException {
-        super(collection, cacheAccessStrategy, cfg, factory);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectCollectionLoader(
-            this,
-            SubselectLoaderUtils.getSubselectQueryForHibernatePre5(subselect.toSubselectString(getCollectionType().getLHSPropertyName())),
-            subselect.getResult(),
-            subselect.getQueryParameters(),
-            subselect.getNamedParameterLocMap(),
-            session.getFactory(),
-            session.getLoadQueryInfluencers()
-        );
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index b322079254..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.cfg.Mappings;
-import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.Mapping;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess jdbcConnectionAccess, Mappings mappings, Mapping mapping, Map map) {
-        delegate.prepare(jdbcServices, jdbcConnectionAccess, mappings, mapping, map);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
-        delegate.release(jdbcServices, connectionAccess);
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index 0c95b84432..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.OneToManyPersister;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    public CustomOneToManyPersister(Collection collection, CollectionRegionAccessStrategy cacheAccessStrategy, Configuration cfg, SessionFactoryImplementor factory) throws MappingException, CacheException {
-        super(collection, cacheAccessStrategy, cfg, factory);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                SubselectLoaderUtils.getSubselectQueryForHibernatePre5(subselect.toSubselectString(getCollectionType().getLHSPropertyName())),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index e185b1e43e..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index bba7c485a1..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index ef5b8af0cf..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.transaction.spi.TransactionCoordinator;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(final SessionImplementor session, QueryParameters queryParameters) {
-        TransactionCoordinator transactionCoordinator = session.getTransactionCoordinator();
-        final JdbcCoordinator jdbcCoordinator = transactionCoordinator.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        Object transactionCoordinatorProxy = Proxy.newProxyInstance(transactionCoordinator.getClass().getClassLoader(), new Class[]{ TransactionCoordinator.class }, new Hibernate43TransactionCoordinatorInvocationHandler(transactionCoordinator, jdbcCoordinatorProxy));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate43SessionInvocationHandler(session, transactionCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java
deleted file mode 100644
index 70c6d86cf4..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Access.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.reflection.ReflectionUtils;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.ejb.HibernateEntityManagerImplementor;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.query.spi.ParameterMetadata;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.engine.transaction.spi.TransactionCoordinator;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.internal.classic.ParserHelper;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.logging.Logger;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate43Access implements HibernateAccess {
-
-    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
-    private static final Method DO_EXECUTE_METHOD;
-
-    static {
-        try {
-            Method m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SessionImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-            DO_EXECUTE_METHOD = m;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        TransactionCoordinator transactionCoordinator = session.getTransactionCoordinator();
-        JdbcCoordinator jdbcCoordinator = transactionCoordinator.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object transactionCoordinatorProxy = Proxy.newProxyInstance(transactionCoordinator.getClass().getClassLoader(), new Class[]{ TransactionCoordinator.class }, new Hibernate43TransactionCoordinatorInvocationHandler(transactionCoordinator, jdbcCoordinatorProxy));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate43SessionInvocationHandler(session, transactionCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate43LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate43SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        coordinator.getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            coordinator.getJdbcCoordinator().afterTransaction();
-        }
-        coordinator.getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Object performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResults scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((org.hibernate.internal.AbstractQueryImpl) hibernateQuery).getQueryParameters(namedParams);
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameters");
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        String query = hibernateQuery.getQueryString();
-        ParameterMetadata parameterMetadata = getParameterMetadata(hibernateQuery);
-        Iterator<Map.Entry<String, TypedValue>> iter = getNamedParamLists(hibernateQuery).entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, TypedValue> me = iter.next();
-            query = expandParameterList(session, parameterMetadata, query, (String) me.getKey(), (TypedValue) me.getValue(), namedParamsCopy);
-        }
-        return query;
-    }
-
-    private ParameterMetadata getParameterMetadata(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "parameterMetadata");
-    }
-
-    private Map<String, TypedValue> getNamedParamLists(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameterLists");
-    }
-
-    private String expandParameterList(SessionImplementor session, ParameterMetadata parameterMetadata, String query, String name, TypedValue typedList, Map<String, TypedValue> namedParamsCopy) {
-        Collection<?> vals = (Collection<?>) typedList.getValue();
-
-        // HHH-1123
-        // Some DBs limit number of IN expressions.  For now, warn...
-        final Dialect dialect = session.getFactory().getDialect();
-        final int inExprLimit = dialect.getInExpressionCountLimit();
-        if (inExprLimit > 0 && vals.size() > inExprLimit) {
-            LOG.warning(String.format("Dialect [%s] limits the number of elements in an IN predicate to %s entries.  " +
-                    "However, the given parameter list [%s] contained %s entries, which will likely cause failures " +
-                    "to execute the query in the database", dialect.getClass().getName(), inExprLimit, name, vals.size()));
-        }
-
-        Type type = typedList.getType();
-
-        boolean isJpaPositionalParam = parameterMetadata.getNamedParameterDescriptor(name).isJpaStyle();
-        String paramPrefix = isJpaPositionalParam ? "?" : ParserHelper.HQL_VARIABLE_PREFIX;
-        String placeholder =
-                new StringBuilder(paramPrefix.length() + name.length())
-                        .append(paramPrefix).append(name)
-                        .toString();
-
-        if (query == null) {
-            return query;
-        }
-        int loc = query.indexOf(placeholder);
-
-        if (loc < 0) {
-            return query;
-        }
-
-        String beforePlaceholder = query.substring(0, loc);
-        String afterPlaceholder =  query.substring(loc + placeholder.length());
-
-        // check if placeholder is already immediately enclosed in parentheses
-        // (ignoring whitespace)
-        boolean isEnclosedInParens =
-                StringHelper.getLastNonWhitespaceCharacter(beforePlaceholder) == '(' &&
-                        StringHelper.getFirstNonWhitespaceCharacter(afterPlaceholder) == ')';
-
-        if (vals.size() == 1  && isEnclosedInParens) {
-            // short-circuit for performance when only 1 value and the
-            // placeholder is already enclosed in parentheses...
-            namedParamsCopy.put(name, new TypedValue(type, vals.iterator().next()));
-            return query;
-        }
-
-        StringBuilder list = new StringBuilder(16);
-        Iterator<?> iter = vals.iterator();
-        int i = 0;
-        while (iter.hasNext()) {
-            // Variable 'name' can represent a number or contain digit at the end. Surrounding it with
-            // characters to avoid ambiguous definition after concatenating value of 'i' counter.
-            String alias = (isJpaPositionalParam ? 'x' + name : name) + '_' + i++ + '_';
-            if (namedParamsCopy.put(alias, new TypedValue(type, iter.next())) != null) {
-                throw new HibernateException("Repeated usage of alias '" + alias + "' while expanding list parameter.");
-            }
-            list.append(ParserHelper.HQL_VARIABLE_PREFIX).append(alias);
-            if (iter.hasNext()) {
-                list.append(", ");
-            }
-        }
-        return StringHelper.replace(
-                beforePlaceholder,
-                afterPlaceholder,
-                placeholder.toString(),
-                list.toString(),
-                true,
-                true
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T getField(Object object, String field) {
-        boolean madeAccessible = false;
-        Field f = null;
-        try {
-            f = ReflectionUtils.getField(object.getClass(), field);
-            madeAccessible = !f.isAccessible();
-
-            if (madeAccessible) {
-                f.setAccessible(true);
-            }
-            return (T) f.get(object);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        } finally {
-            if (madeAccessible) {
-                f.setAccessible(false);
-            }
-        }
-    }
-
-    private HibernateEntityManagerImplementor getEntityManager(EntityManager em) {
-        return (HibernateEntityManagerImplementor) em.unwrap(EntityManager.class);
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getEntityManager(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getEntityManager(em).handlePersistenceException(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getEntityManager(em).throwPersistenceException(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                queryHints,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        return new ParameterTranslationsImpl(queryParameterSpecifications);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43DelegatingDialect.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43DelegatingDialect.java
deleted file mode 100644
index c83dbbac9c..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43DelegatingDialect.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.ScrollMode;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.metamodel.spi.TypeContributions;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.procedure.spi.CallableStatementSupport;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate43DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public boolean supportsIdentityColumns() {
-        return delegate.supportsIdentityColumns();
-    }
-
-    @Override
-    public boolean supportsInsertSelectIdentity() {
-        return delegate.supportsInsertSelectIdentity();
-    }
-
-    @Override
-    public boolean hasDataTypeInIdentityColumn() {
-        return delegate.hasDataTypeInIdentityColumn();
-    }
-
-    @Override
-    public String appendIdentitySelectToInsert(String insertString) {
-        return delegate.appendIdentitySelectToInsert(insertString);
-    }
-
-    @Override
-    public String getIdentitySelectString(String table, String column, int type) throws MappingException {
-        return delegate.getIdentitySelectString(table, column, type);
-    }
-
-    @Override
-    public String getIdentityColumnString(int type) throws MappingException {
-        return delegate.getIdentityColumnString(type);
-    }
-
-    @Override
-    public String getIdentityInsertString() {
-        return delegate.getIdentityInsertString();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public LimitHandler buildLimitHandler(String sql, RowSelection selection) {
-        return delegate.buildLimitHandler(sql, selection);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString() {
-        return delegate.getForUpdateSkipLockedString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString(String aliases) {
-        return delegate.getForUpdateSkipLockedString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public boolean supportsTemporaryTables() {
-        return delegate.supportsTemporaryTables();
-    }
-
-    @Override
-    public String generateTemporaryTableName(String baseTableName) {
-        return delegate.generateTemporaryTableName(baseTableName);
-    }
-
-    @Override
-    public String getCreateTemporaryTableString() {
-        return delegate.getCreateTemporaryTableString();
-    }
-
-    @Override
-    public String getCreateTemporaryTablePostfix() {
-        return delegate.getCreateTemporaryTablePostfix();
-    }
-
-    @Override
-    public String getDropTemporaryTableString() {
-        return delegate.getDropTemporaryTableString();
-    }
-
-    @Override
-    public Boolean performTemporaryTableDDLInIsolation() {
-        return delegate.performTemporaryTableDDLInIsolation();
-    }
-
-    @Override
-    public boolean dropTemporaryTableAfterUse() {
-        return delegate.dropTemporaryTableAfterUse();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, name);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
-        return delegate.getResultSet(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
-        return delegate.getResultSet(statement, name);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public String getCreateSchemaCommand(String schemaName) {
-        return delegate.getCreateSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String getDropSchemaCommand(String schemaName) {
-        return delegate.getDropSchemaCommand(schemaName);
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getAddColumnSuffixString() {
-        return delegate.getAddColumnSuffixString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeConstraintName() {
-        return delegate.supportsIfExistsBeforeConstraintName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterConstraintName() {
-        return delegate.supportsIfExistsAfterConstraintName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getQueryHintString(String query, List<String> hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public ScrollMode defaultScrollMode() {
-        return delegate.defaultScrollMode();
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-
-    @Override
-    public CallableStatementSupport getCallableStatementSupport() {
-        return delegate.getCallableStatementSupport();
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43EntityManagerFactoryIntegrator.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43EntityManagerFactoryIntegrator.java
deleted file mode 100644
index f93e5dd904..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.ejb.HibernateEntityManagerFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate43EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        return getDbmsName(entityManagerFactory, null, entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (factory == null && entityManagerFactory != null) {
-                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
-                    }
-                    if (factory != null) {
-                        return new HibernateJpa21Provider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpa21Provider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Integrator.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Integrator.java
deleted file mode 100644
index d0046991df..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43Integrator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.SimpleTableNameFormatter;
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.registry.selector.spi.StrategySelector;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.PersistentTableBulkIdStrategy;
-import org.hibernate.hql.spi.TemporaryTableBulkIdStrategy;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.ServiceContributingIntegrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.metamodel.source.MetadataImplementor;
-import org.hibernate.metamodel.spi.TypeContributions;
-import org.hibernate.metamodel.spi.TypeContributor;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate43Integrator implements ServiceContributingIntegrator, TypeContributor {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate43Integrator.class.getName());
-    private static final ThreadLocal<ServiceRegistry> SERVICE_REGISTRY_ACCESS = new ThreadLocal<>();
-
-    @Override
-    public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        SERVICE_REGISTRY_ACCESS.set(serviceRegistry);
-    }
-
-    @Override
-    public void prepareServices(final StandardServiceRegistryBuilder serviceRegistryBuilder) {
-        final StrategySelector strategySelector = serviceRegistryBuilder.getBootstrapServiceRegistry().getService(StrategySelector.class);
-        serviceRegistryBuilder.addService(StrategySelector.class, new StrategySelector() {
-            @Override
-            public <T> void registerStrategyImplementor(Class<T> aClass, String s, Class<? extends T> aClass1) {
-                strategySelector.registerStrategyImplementor(aClass, s, aClass1);
-            }
-
-            @Override
-            public <T> void unRegisterStrategyImplementor(Class<T> aClass, Class<? extends T> aClass1) {
-                strategySelector.unRegisterStrategyImplementor(aClass, aClass1);
-            }
-
-            @Override
-            public <T> Class<? extends T> selectStrategyImplementor(Class<T> aClass, String s) {
-                return strategySelector.selectStrategyImplementor(aClass, s);
-            }
-
-            @Override
-            public <T> T resolveStrategy(Class<T> aClass, Object o) {
-                if (MultiTableBulkIdStrategy.class == aClass) {
-                    try {
-                        if (o == null) {
-                            ServiceRegistry serviceRegistry = SERVICE_REGISTRY_ACCESS.get();
-                            return (T) new CustomMultiTableBulkIdStrategy(serviceRegistry.getService(JdbcServices.class).getDialect().supportsTemporaryTables() ? TemporaryTableBulkIdStrategy.INSTANCE : new PersistentTableBulkIdStrategy());
-                        } else {
-                            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + o);
-                        }
-                    } finally {
-                        SERVICE_REGISTRY_ACCESS.remove();
-                    }
-                }
-                return strategySelector.resolveStrategy(aClass, o);
-            }
-
-            @Override
-            public <T> T resolveDefaultableStrategy(Class<T> aClass, Object o, T t) {
-                return strategySelector.resolveDefaultableStrategy(aClass, o, t);
-            }
-        });
-        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(@SuppressWarnings("rawtypes") Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-
-    @Override
-    public void integrate(Configuration configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        Class<?> valuesEntity;
-        boolean registerValuesEntity = true;
-        try {
-            valuesEntity = Class.forName("com.blazebit.persistence.impl.function.entity.ValuesEntity");
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Are you missing blaze-persistence-core-impl on the classpath?", e);
-        }
-
-        Iterator<PersistentClass> iter = configuration.getClassMappings();
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        while (iter.hasNext()) {
-            PersistentClass clazz = iter.next();
-            Class<?> entityClass = clazz.getMappedClass();
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        if (registerValuesEntity) {
-            // Register values entity if wasn't found
-            configuration.addAnnotatedClass(valuesEntity);
-            configuration.buildMappings();
-            PersistentClass clazz = configuration.getClassMapping(valuesEntity.getName());
-            clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings(), sessionFactory.getDialect(), new SimpleTableNameFormatter(), configuration.buildMapping()));
-    }
-
-    @Override
-    public void integrate(MetadataImplementor metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandler.java
deleted file mode 100644
index 3d2e8511af..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private final String sql;
-    private final Integer limit;
-    private final Integer offset;
-
-    public Hibernate43LimitHandler(Dialect dialect, DbmsDialect dbmsDialect, String sql, RowSelection selection) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-        this.sql = sql;
-
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String getProcessedSql() {
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandlingDialect.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandlingDialect.java
deleted file mode 100644
index a969171bec..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43LimitHandlingDialect extends Hibernate43DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate43LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler buildLimitHandler(String sql, RowSelection selection) {
-        return new Hibernate43LimitHandler(this, dbmsDialect, sql, selection);
-    }
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionFactoryInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionFactoryInvocationHandler.java
deleted file mode 100644
index ebcad6537f..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate43SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionInvocationHandler.java
deleted file mode 100644
index d9dd982a0f..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object transactionCoordinatorProxy;
-
-    public Hibernate43SessionInvocationHandler(SessionImplementor delegate, Object transactionCoordinatorProxy) {
-        this.delegate = delegate;
-        this.transactionCoordinatorProxy = transactionCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getTransactionCoordinator".equals(method.getName())) {
-            return transactionCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43TransactionCoordinatorInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43TransactionCoordinatorInvocationHandler.java
deleted file mode 100644
index 2b3fb59a61..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate43TransactionCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate43TransactionCoordinatorInvocationHandler implements InvocationHandler {
-    
-    private final Object delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate43TransactionCoordinatorInvocationHandler(Object delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java
deleted file mode 100644
index cff719331f..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionAccessFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Christian Beikov
- * @since 1.4.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate4TransactionAccessFactory implements TransactionAccessFactory {
-
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        return new Hibernate4TransactionSynchronizationStrategy(entityManager);
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java
deleted file mode 100644
index 02b1628076..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate4TransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.transaction.spi.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate4TransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate4TransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getSynchronizationRegistry();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        try {
-            synchronizationRegistry.registerSynchronization(synchronization);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index 76c46a02d2..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index f3212cf2dd..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getTransactionCoordinator().getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getTransactionCoordinator().getJdbcCoordinator().release(ps);
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index 6f2d1d62e3..0000000000
--- a/integration/hibernate-4.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.cfg.Settings;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final Settings settings() {
-        return sessionFactoryImplementor.getSettings();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return jdbcCoordinator.getTransactionCoordinator()
-            .getTransactionContext()
-            .getTransactionEnvironment()
-            .getJdbcServices()
-            .getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{ PreparedStatement.class }, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String sql) {
-            this.sql = jdbcCoordinator.getTransactionCoordinator().getTransactionContext().onPrepareStatement(sql);
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                jdbcCoordinator.getLogicalConnection().getJdbcServices().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getTransactionCoordinator().getTransactionContext().startPrepareStatement();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getTransactionCoordinator().getTransactionContext().endPrepareStatement();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.register(preparedStatement);
-            logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-4.3/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor b/integration/hibernate-4.3/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor
deleted file mode 100644
index deb0be8c89..0000000000
--- a/integration/hibernate-4.3/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.hibernate.Hibernate43Integrator
\ No newline at end of file
diff --git a/integration/hibernate-5.2/pom.xml b/integration/hibernate-5.2/pom.xml
deleted file mode 100644
index 3524d5f0a7..0000000000
--- a/integration/hibernate-5.2/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5.2</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <!-- Minimum version is 5.2.0.Final -->
-            <version>5.2.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate52Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate52EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate52Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate52MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate52ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index 7f186ebb66..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    public CustomBasicCollectionPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectCollectionLoader(
-            this,
-            subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-            subselect.getResult(),
-            subselect.getQueryParameters(),
-            subselect.getNamedParameterLocMap(),
-            session.getFactory(),
-            session.getLoadQueryInfluencers()
-        );
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index ac9b9525b9..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess, MetadataImplementor metadata, SessionFactoryOptions sessionFactoryOptions) {
-        delegate.prepare(jdbcServices, connectionAccess, metadata, sessionFactoryOptions);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
-        delegate.release(jdbcServices, connectionAccess);
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index c426c50db4..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.OneToManyPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    public CustomOneToManyPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index 2103744629..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index 3e4050b39c..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index 48870f3d5b..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(SharedSessionContractImplementor s, QueryParameters queryParameters) {
-        final SessionImplementor session = (SessionImplementor) s;
-        final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{SessionImplementor.class, EventSource.class}, new Hibernate52SessionInvocationHandler((SessionImplementor) session, jdbcCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java
deleted file mode 100644
index 97ff0edede..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Access.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.spi.ExceptionConverter;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.query.internal.AbstractProducedQuery;
-import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.query.spi.QueryImplementor;
-import org.hibernate.query.spi.ScrollableResultsImplementor;
-import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
-import org.hibernate.resource.transaction.spi.TransactionCoordinator;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.logging.Logger;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate52Access implements HibernateAccess {
-
-    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
-    private static final Method DO_EXECUTE_METHOD;
-
-    static {
-        try {
-            Method m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SharedSessionContractImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-            DO_EXECUTE_METHOD = m;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-    
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate52SessionInvocationHandler(session, jdbcCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    @Override
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate52LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate52SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            session.getJdbcCoordinator().afterTransaction();
-        }
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Object performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResultsImplementor scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((AbstractProducedQuery<?>) hibernateQuery).getQueryParameters();
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        return queryParameterBindings.collectNamedParameterBindings();
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        SharedSessionContractImplementor producer = (SharedSessionContractImplementor) ((QueryImplementor<?>) hibernateQuery).getProducer();
-        String query = hibernateQuery.getQueryString();
-
-        query = queryParameterBindings.expandListValuedParameters(query, producer);
-        return query;
-    }
-
-    private ExceptionConverter getExceptionConverter(EntityManager em) {
-        return em.unwrap(SharedSessionContractImplementor.class).getExceptionConverter();
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                queryHints,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        return new ParameterTranslationsImpl(queryParameterSpecifications);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52DelegatingDialect.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52DelegatingDialect.java
deleted file mode 100644
index e1f193290a..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52DelegatingDialect.java
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
-import org.hibernate.boot.model.relational.Sequence;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.identity.IdentityColumnSupport;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
-import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
-import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.loader.BatchLoadSizingStrategy;
-import org.hibernate.mapping.Constraint;
-import org.hibernate.mapping.ForeignKey;
-import org.hibernate.mapping.Index;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.procedure.spi.CallableStatementSupport;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
-import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate52DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate52DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public boolean isTypeNameRegistered(String typeName) {
-        return delegate.isTypeNameRegistered(typeName);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public IdentityColumnSupport getIdentityColumnSupport() {
-        return delegate.getIdentityColumnSupport();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public SequenceInformationExtractor getSequenceInformationExtractor() {
-        return delegate.getSequenceInformationExtractor();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return delegate.getLimitHandler();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString() {
-        return delegate.getForUpdateSkipLockedString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString(String aliases) {
-        return delegate.getForUpdateSkipLockedString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
-        return delegate.getDefaultMultiTableBulkIdStrategy();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, name);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
-        return delegate.getResultSet(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
-        return delegate.getResultSet(statement, name);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    @Deprecated
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
-        return delegate.buildIdentifierHelper(builder, dbMetaData);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public Exporter<Table> getTableExporter() {
-        return delegate.getTableExporter();
-    }
-
-    @Override
-    public Exporter<Sequence> getSequenceExporter() {
-        return delegate.getSequenceExporter();
-    }
-
-    @Override
-    public Exporter<Index> getIndexExporter() {
-        return delegate.getIndexExporter();
-    }
-
-    @Override
-    public Exporter<ForeignKey> getForeignKeyExporter() {
-        return delegate.getForeignKeyExporter();
-    }
-
-    @Override
-    public Exporter<Constraint> getUniqueKeyExporter() {
-        return delegate.getUniqueKeyExporter();
-    }
-
-    @Override
-    public Exporter<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectExporter() {
-        return delegate.getAuxiliaryDatabaseObjectExporter();
-    }
-
-    @Override
-    public boolean canCreateCatalog() {
-        return delegate.canCreateCatalog();
-    }
-
-    @Override
-    public String[] getCreateCatalogCommand(String catalogName) {
-        return delegate.getCreateCatalogCommand(catalogName);
-    }
-
-    @Override
-    public String[] getDropCatalogCommand(String catalogName) {
-        return delegate.getDropCatalogCommand(catalogName);
-    }
-
-    @Override
-    public boolean canCreateSchema() {
-        return delegate.canCreateSchema();
-    }
-
-    @Override
-    public String[] getCreateSchemaCommand(String schemaName) {
-        return delegate.getCreateSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String[] getDropSchemaCommand(String schemaName) {
-        return delegate.getDropSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String getCurrentSchemaCommand() {
-        return delegate.getCurrentSchemaCommand();
-    }
-
-    @Override
-    public SchemaNameResolver getSchemaNameResolver() {
-        return delegate.getSchemaNameResolver();
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getAddColumnSuffixString() {
-        return delegate.getAddColumnSuffixString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeConstraintName() {
-        return delegate.supportsIfExistsBeforeConstraintName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterConstraintName() {
-        return delegate.supportsIfExistsAfterConstraintName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public boolean requiresParensForTupleDistinctCounts() {
-        return delegate.requiresParensForTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getQueryHintString(String query, List<String> hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public ScrollMode defaultScrollMode() {
-        return delegate.defaultScrollMode();
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-
-    @Override
-    public CallableStatementSupport getCallableStatementSupport() {
-        return delegate.getCallableStatementSupport();
-    }
-
-    @Override
-    public NameQualifierSupport getNameQualifierSupport() {
-        return delegate.getNameQualifierSupport();
-    }
-
-    @Override
-    public BatchLoadSizingStrategy getDefaultBatchLoadSizingStrategy() {
-        return delegate.getDefaultBatchLoadSizingStrategy();
-    }
-
-    @Override
-    public boolean isJdbcLogWarningsEnabledByDefault() {
-        return delegate.isJdbcLogWarningsEnabledByDefault();
-    }
-
-    @Override
-    public void augmentRecognizedTableTypes(List<String> tableTypesList) {
-        delegate.augmentRecognizedTableTypes(tableTypesList);
-    }
-
-    @Override
-    public boolean supportsPartitionBy() {
-        // NOTE: we can't delegate because this is called in constructor
-        return false;
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52EntityManagerFactoryIntegrator.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52EntityManagerFactoryIntegrator.java
deleted file mode 100644
index 941c5f44df..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.jpa.HibernateEntityManagerFactory;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate52EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        return getDbmsName(entityManagerFactory, null, entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (factory == null && entityManagerFactory != null) {
-                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
-                    }
-                    if (factory != null) {
-                        return new HibernateJpa21Provider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpa21Provider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Integrator.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Integrator.java
deleted file mode 100644
index 73e9a33ace..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52Integrator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.relational.Namespace;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate52Integrator implements Integrator {
-
-    @Override
-    public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        // TODO: remember metadata for exact column types
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        for (PersistentClass clazz : metadata.getEntityBindings()) {
-            Class<?> entityClass = clazz.getMappedClass();
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        TableNameFormatter formatter = new NativeTableNameFormatter(sessionFactory.getJdbcServices().getJdbcEnvironment().getQualifiedObjectNameFormatter());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(getTableIterator(metadata.getDatabase().getNamespaces()), sessionFactory.getDialect(), formatter, metadata));
-    }
-
-    private Iterator<Table> getTableIterator(Iterable<Namespace> namespaces) {
-        List<Iterator<Table>> iterators = new ArrayList<>();
-        Iterator<Namespace> namespaceIterator = namespaces.iterator();
-
-        while (namespaceIterator.hasNext()) {
-            iterators.add(namespaceIterator.next().getTables().iterator());
-        }
-
-        return new MultiIterator<>(iterators);
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandler.java
deleted file mode 100644
index 25e2944ae9..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate52LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private Integer limit;
-    private Integer offset;
-
-    public Hibernate52LimitHandler(Dialect dialect, DbmsDialect dbmsDialect) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String processSql(String sql, RowSelection selection) {
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(RowSelection selection, PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandlingDialect.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandlingDialect.java
deleted file mode 100644
index de6a6bbd5c..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate52LimitHandlingDialect extends Hibernate52DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate52LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return new Hibernate52LimitHandler(this, dbmsDialect);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52MetadataContributor.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52MetadataContributor.java
deleted file mode 100644
index afc86ad32a..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52MetadataContributor.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.boot.internal.ClassLoaderAccessImpl;
-import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.boot.spi.MetadataContributor;
-import org.hibernate.cfg.AnnotationBinder;
-import org.hibernate.cfg.InheritanceState;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.service.Service;
-import org.hibernate.service.spi.Configurable;
-import org.hibernate.service.spi.ServiceBinding;
-import org.jboss.jandex.IndexView;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(MetadataContributor.class)
-public class Hibernate52MetadataContributor implements MetadataContributor, Service, Configurable {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate52MetadataContributor.class.getName());
-    private Map<String, Object> configurationValues;
-
-    @Override
-    public void configure(Map configurationValues) {
-        this.configurationValues = configurationValues;
-    }
-
-    @Override
-    public void contribute(InFlightMetadataCollector metadataCollector, IndexView jandexIndex) {
-        ServiceBinding.ServiceLifecycleOwner lifecycleOwner = (ServiceBinding.ServiceLifecycleOwner) metadataCollector.getMetadataBuildingOptions().getServiceRegistry();
-        lifecycleOwner.configureService(new ServiceBinding<>(lifecycleOwner, Hibernate52MetadataContributor.class, this));
-        Object existingStrategy = configurationValues.get("hibernate.hql.bulk_id_strategy");
-        if (existingStrategy == null) {
-            JdbcServices jdbcService = metadataCollector.getMetadataBuildingOptions().getServiceRegistry().getService(JdbcServices.class);
-            MultiTableBulkIdStrategy defaultMultiTableBulkIdStrategy = jdbcService.getDialect().getDefaultMultiTableBulkIdStrategy();
-            configurationValues.put("hibernate.hql.bulk_id_strategy", new CustomMultiTableBulkIdStrategy(defaultMultiTableBulkIdStrategy));
-        } else {
-            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + existingStrategy);
-        }
-        // Skip if already registered
-        if (metadataCollector.getEntityBinding("com.blazebit.persistence.impl.function.entity.ValuesEntity") != null) {
-            return;
-        }
-
-        MetadataBuildingOptions options = metadataCollector.getMetadataBuildingOptions();
-        final ClassLoaderService classLoaderService = options.getServiceRegistry().getService( ClassLoaderService.class );
-
-        final ClassLoaderAccess classLoaderAccess = new ClassLoaderAccessImpl(
-                options.getTempClassLoader(),
-                classLoaderService
-        );
-
-        MetadataBuildingContext metadataBuildingContext = new MetadataBuildingContextRootImpl(
-                options,
-                classLoaderAccess,
-                metadataCollector);
-
-        addEntity("com.blazebit.persistence.impl.function.entity.ValuesEntity", metadataBuildingContext);
-    }
-
-    private void addEntity(String className, MetadataBuildingContext metadataBuildingContext) {
-        try {
-            MetadataBuildingOptions options = metadataBuildingContext.getBuildingOptions();
-            Object /*ReflectionManager*/ reflectionManager = MetadataBuildingOptions.class.getMethod("getReflectionManager").invoke(options);
-            //            Object /*XClass*/ clazz = reflectionManager.classForName(className);
-            Method classForName = reflectionManager.getClass().getMethod("classForName", String.class);
-            Object /*XClass*/ clazz = classForName.invoke(reflectionManager, className);
-            Map<Object /*XClass*/, InheritanceState> inheritanceStatePerClass = new HashMap<Object /*XClass*/, InheritanceState>(1);
-
-            //        InheritanceState state = new InheritanceState(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            InheritanceState state = InheritanceState.class.getConstructor(classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .newInstance(clazz, inheritanceStatePerClass, metadataBuildingContext);
-
-            inheritanceStatePerClass.put(clazz, state);
-
-            //        AnnotationBinder.bindClass(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            AnnotationBinder.class.getMethod("bindClass", classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .invoke(null, clazz, inheritanceStatePerClass, metadataBuildingContext);
-        } catch (RuntimeException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not add entity", ex);
-        }
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52ServiceContributor.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52ServiceContributor.java
deleted file mode 100644
index 43fc5e15f0..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52ServiceContributor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.spi.ServiceContributor;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ServiceContributor.class)
-public class Hibernate52ServiceContributor implements ServiceContributor {
-
-    @Override
-    public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
-        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(@SuppressWarnings("rawtypes") Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionFactoryInvocationHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionFactoryInvocationHandler.java
deleted file mode 100644
index ec382e4a11..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate52SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate52SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionInvocationHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionInvocationHandler.java
deleted file mode 100644
index d0ccfdc072..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate52SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate52SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate52SessionInvocationHandler(SessionImplementor delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
deleted file mode 100644
index 1d503d46b0..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.resource.transaction.spi.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5EntityTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate5EntityTransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getLocalSynchronizations();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        synchronizationRegistry.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
deleted file mode 100644
index 63c4c8bd91..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-/**
- * @author Moritz Becker
- * @since 1.4.0
- */
-public class Hibernate5JtaPlatformTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-
-    private final JtaPlatform jtaPlatform;
-    private final TransactionManager jtaTransactionManager;
-
-    public Hibernate5JtaPlatformTransactionSynchronizationStrategy(JtaPlatform jtaPlatform) {
-        this.jtaPlatform = jtaPlatform;
-        this.jtaTransactionManager = jtaPlatform.retrieveTransactionManager();
-    }
-
-    @Override
-    public boolean isActive() {
-        try {
-            return jtaPlatform.getCurrentStatus() == Status.STATUS_ACTIVE;
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        try {
-            jtaTransactionManager.setRollbackOnly();
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        jtaPlatform.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
deleted file mode 100644
index a9a4592359..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.hibernate.service.ServiceRegistry;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate5TransactionAccessFactory implements TransactionAccessFactory {
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        JtaPlatform jtaPlatform = getHibernate5JtaPlatformPresent(entityManager);
-        if (jtaPlatform == null || NoJtaPlatform.class == jtaPlatform.getClass()) {
-            return new Hibernate5EntityTransactionSynchronizationStrategy(entityManager);
-        } else {
-            return new Hibernate5JtaPlatformTransactionSynchronizationStrategy(jtaPlatform);
-        }
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
-    private static JtaPlatform getHibernate5JtaPlatformPresent(EntityManager em) {
-        Session hibernateSession = em.unwrap(Session.class);
-        SessionFactory hibernateSessionFactory = hibernateSession.getSessionFactory();
-        ServiceRegistry hibernateServiceRegistry = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry();
-        return hibernateServiceRegistry.getService(JtaPlatform.class);
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index 76c46a02d2..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
deleted file mode 100644
index ca9951a57e..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class NativeTableNameFormatter implements TableNameFormatter {
-
-    private final QualifiedObjectNameFormatter formatter;
-
-    public NativeTableNameFormatter(QualifiedObjectNameFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    @Override
-    public String getQualifiedTableName(Dialect dialect, Table table) {
-        return formatter.format(table.getQualifiedTableName(), dialect);
-    }
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index b14fa75d6c..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release(ps);
-                            session.getJdbcCoordinator().afterStatementExecution();
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index cb80278d05..0000000000
--- a/integration/hibernate-5.2/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final SessionFactoryOptions settings() {
-        return sessionFactoryImplementor.getSessionFactoryOptions();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getPhysicalConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return getJdbcService().getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{PreparedStatement.class}, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String incomingSql) {
-            final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getStatementInspector().inspect(incomingSql);
-            this.sql = inspectedSql == null ? incomingSql : inspectedSql;
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                getJdbcService().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementStart();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementEnd();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.getResourceRegistry().register(preparedStatement, true);
-            //          logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    private JdbcServices getJdbcService() {
-        return jdbcCoordinator
-                .getJdbcSessionOwner()
-                .getJdbcSessionContext()
-                .getServiceRegistry()
-                .getService(JdbcServices.class);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-5.3/pom.xml b/integration/hibernate-5.3/pom.xml
deleted file mode 100644
index a44e51056e..0000000000
--- a/integration/hibernate-5.3/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5.3</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version.hibernate-5.3}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate53Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate53EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate53Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate53MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate53ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index bb8d895fe8..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    public CustomBasicCollectionPersister(Collection collectionBinding, CollectionDataAccess cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectCollectionLoader(
-            this,
-            subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-            subselect.getResult(),
-            subselect.getQueryParameters(),
-            subselect.getNamedParameterLocMap(),
-            session.getFactory(),
-            session.getLoadQueryInfluencers()
-        );
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index ac9b9525b9..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess, MetadataImplementor metadata, SessionFactoryOptions sessionFactoryOptions) {
-        delegate.prepare(jdbcServices, connectionAccess, metadata, sessionFactoryOptions);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
-        delegate.release(jdbcServices, connectionAccess);
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index af88bbe813..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.OneToManyPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    public CustomOneToManyPersister(Collection collectionBinding, CollectionDataAccess cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index 2103744629..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index 3e4050b39c..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index 21bf6c3f7d..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(SharedSessionContractImplementor s, QueryParameters queryParameters) {
-        final SessionImplementor session = (SessionImplementor) s;
-        final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{SessionImplementor.class, EventSource.class}, new Hibernate53SessionInvocationHandler(session, jdbcCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java
deleted file mode 100644
index 3299449cd1..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Access.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.spi.ExceptionConverter;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.query.internal.AbstractProducedQuery;
-import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.query.spi.QueryImplementor;
-import org.hibernate.query.spi.ScrollableResultsImplementor;
-import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
-import org.hibernate.resource.transaction.spi.TransactionCoordinator;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate53Access implements HibernateAccess {
-
-    private static final Method DO_EXECUTE_METHOD;
-    private static final Method DO_EXECUTE_METHOD_NEW;
-    private static final Constructor<ParameterTranslationsImpl> PARAMETER_TRANSLATIONS_CONSTRUCTOR;
-
-    static {
-        Method m = null;
-        Method mNew = null;
-        try {
-            m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SharedSessionContractImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-        } catch (Exception e) {
-            // As of Hibernate 5.4.21 the signature changed...
-            try {
-                mNew = BasicExecutor.class.getDeclaredMethod("doExecute", String.class, QueryParameters.class, List.class, SharedSessionContractImplementor.class);
-                mNew.setAccessible(true);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-        DO_EXECUTE_METHOD = m;
-        DO_EXECUTE_METHOD_NEW = mNew;
-        try {
-            Constructor<ParameterTranslationsImpl> c = ParameterTranslationsImpl.class.getDeclaredConstructor(List.class);
-            c.setAccessible(true);
-            PARAMETER_TRANSLATIONS_CONSTRUCTOR = c;
-        } catch (Exception ex) {
-            // As of Hibernate 5.4.21 the signature changed...
-            throw new RuntimeException(ex);
-        }
-    }
-    
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate53SessionInvocationHandler(session, jdbcCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    @Override
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate53LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate53SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            session.getJdbcCoordinator().afterTransaction();
-        }
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Stream<Object> performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResultsImplementor scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            if (DO_EXECUTE_METHOD == null) {
-                DO_EXECUTE_METHOD_NEW.invoke(executor, delete, parameters, parameterSpecifications, session);
-            } else {
-                DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((AbstractProducedQuery<?>) hibernateQuery).getQueryParameters();
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        return queryParameterBindings.collectNamedParameterBindings();
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        SharedSessionContractImplementor producer = (SharedSessionContractImplementor) ((QueryImplementor<?>) hibernateQuery).getProducer();
-        String query = hibernateQuery.getQueryString();
-
-        // NOTE: In Hibernate 5.3.0.CR1 this is call causes a side effect which is why this is essentially unusable for us
-        query = queryParameterBindings.expandListValuedParameters(query, producer);
-        return query;
-    }
-
-    private ExceptionConverter getExceptionConverter(EntityManager em) {
-        return em.unwrap(SharedSessionContractImplementor.class).getExceptionConverter();
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                queryHints,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        try {
-            return PARAMETER_TRANSLATIONS_CONSTRUCTOR.newInstance(queryParameterSpecifications);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java
deleted file mode 100644
index 5fd56d3c95..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53DelegatingDialect.java
+++ /dev/null
@@ -1,985 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
-import org.hibernate.boot.model.relational.Sequence;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.identity.IdentityColumnSupport;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
-import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
-import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.loader.BatchLoadSizingStrategy;
-import org.hibernate.mapping.Constraint;
-import org.hibernate.mapping.ForeignKey;
-import org.hibernate.mapping.Index;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.procedure.spi.CallableStatementSupport;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
-import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate53DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate53DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public boolean isTypeNameRegistered(String typeName) {
-        return delegate.isTypeNameRegistered(typeName);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    @SuppressWarnings({ "rawtypes", "deprecation" })
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public IdentityColumnSupport getIdentityColumnSupport() {
-        return delegate.getIdentityColumnSupport();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public SequenceInformationExtractor getSequenceInformationExtractor() {
-        return delegate.getSequenceInformationExtractor();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return delegate.getLimitHandler();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString() {
-        return delegate.getForUpdateSkipLockedString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString(String aliases) {
-        return delegate.getForUpdateSkipLockedString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
-        return delegate.getDefaultMultiTableBulkIdStrategy();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, name);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
-        return delegate.getResultSet(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
-        return delegate.getResultSet(statement, name);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    @Deprecated
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
-        return delegate.buildIdentifierHelper(builder, dbMetaData);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public Exporter<Table> getTableExporter() {
-        return delegate.getTableExporter();
-    }
-
-    @Override
-    public Exporter<Sequence> getSequenceExporter() {
-        return delegate.getSequenceExporter();
-    }
-
-    @Override
-    public Exporter<Index> getIndexExporter() {
-        return delegate.getIndexExporter();
-    }
-
-    @Override
-    public Exporter<ForeignKey> getForeignKeyExporter() {
-        return delegate.getForeignKeyExporter();
-    }
-
-    @Override
-    public Exporter<Constraint> getUniqueKeyExporter() {
-        return delegate.getUniqueKeyExporter();
-    }
-
-    @Override
-    public Exporter<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectExporter() {
-        return delegate.getAuxiliaryDatabaseObjectExporter();
-    }
-
-    @Override
-    public boolean canCreateCatalog() {
-        return delegate.canCreateCatalog();
-    }
-
-    @Override
-    public String[] getCreateCatalogCommand(String catalogName) {
-        return delegate.getCreateCatalogCommand(catalogName);
-    }
-
-    @Override
-    public String[] getDropCatalogCommand(String catalogName) {
-        return delegate.getDropCatalogCommand(catalogName);
-    }
-
-    @Override
-    public boolean canCreateSchema() {
-        return delegate.canCreateSchema();
-    }
-
-    @Override
-    public String[] getCreateSchemaCommand(String schemaName) {
-        return delegate.getCreateSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String[] getDropSchemaCommand(String schemaName) {
-        return delegate.getDropSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String getCurrentSchemaCommand() {
-        return delegate.getCurrentSchemaCommand();
-    }
-
-    @Override
-    public SchemaNameResolver getSchemaNameResolver() {
-        return delegate.getSchemaNameResolver();
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getAddColumnSuffixString() {
-        return delegate.getAddColumnSuffixString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeConstraintName() {
-        return delegate.supportsIfExistsBeforeConstraintName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterConstraintName() {
-        return delegate.supportsIfExistsAfterConstraintName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public boolean requiresParensForTupleDistinctCounts() {
-        return delegate.requiresParensForTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getQueryHintString(String query, List<String> hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public ScrollMode defaultScrollMode() {
-        return delegate.defaultScrollMode();
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-
-    @Override
-    public CallableStatementSupport getCallableStatementSupport() {
-        return delegate.getCallableStatementSupport();
-    }
-
-    @Override
-    public NameQualifierSupport getNameQualifierSupport() {
-        return delegate.getNameQualifierSupport();
-    }
-
-    @Override
-    public BatchLoadSizingStrategy getDefaultBatchLoadSizingStrategy() {
-        return delegate.getDefaultBatchLoadSizingStrategy();
-    }
-
-    @Override
-    public boolean isJdbcLogWarningsEnabledByDefault() {
-        return delegate.isJdbcLogWarningsEnabledByDefault();
-    }
-
-    @Override
-    public void augmentRecognizedTableTypes(List<String> tableTypesList) {
-        delegate.augmentRecognizedTableTypes(tableTypesList);
-    }
-
-    @Override
-    public String getNativeIdentifierGeneratorStrategy() {
-        return delegate.getNativeIdentifierGeneratorStrategy();
-    }
-
-    @Override
-    public String getWriteLockString(String aliases, int timeout) {
-        return delegate.getWriteLockString(aliases, timeout);
-    }
-
-    @Override
-    public String getReadLockString(String aliases, int timeout) {
-        return delegate.getReadLockString(aliases, timeout);
-    }
-
-    @Override
-    public String getAlterTableString(String tableName) {
-        return delegate.getAlterTableString(tableName);
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String foreignKeyDefinition) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKeyDefinition);
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterAlterTable() {
-        return delegate.supportsIfExistsAfterAlterTable();
-    }
-
-    @Override
-    public boolean useFollowOnLocking(QueryParameters parameters) {
-        return delegate.useFollowOnLocking(parameters);
-    }
-
-    @Override
-    public String getQueryHintString(String query, String hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public boolean supportsNamedParameters(DatabaseMetaData databaseMetaData) throws SQLException {
-        return delegate.supportsNamedParameters(databaseMetaData);
-    }
-
-    @Override
-    public boolean supportsNationalizedTypes() {
-        return delegate.supportsNationalizedTypes();
-    }
-
-    @Override
-    public boolean supportsNonQueryWithCTE() {
-        return delegate.supportsNonQueryWithCTE();
-    }
-
-    @Override
-    public boolean supportsValuesList() {
-        return delegate.supportsValuesList();
-    }
-
-    @Override
-    public boolean supportsSkipLocked() {
-        return delegate.supportsSkipLocked();
-    }
-
-    @Override
-    public boolean supportsNoWait() {
-        return delegate.supportsNoWait();
-    }
-
-    @Override
-    public boolean isLegacyLimitHandlerBehaviorEnabled() {
-        return delegate.isLegacyLimitHandlerBehaviorEnabled();
-    }
-
-    @Override
-    public String inlineLiteral(String literal) {
-        return delegate.inlineLiteral(literal);
-    }
-
-    @Override
-    public String addSqlHintOrComment(String sql, QueryParameters parameters, boolean commentsEnabled) {
-        return delegate.addSqlHintOrComment(sql, parameters, commentsEnabled);
-    }
-
-    @Override
-    public boolean supportsPartitionBy() {
-        // NOTE: we can't delegate because this is called in constructor
-        return false;
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java
deleted file mode 100644
index dbaaa06817..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.jpa.HibernateEntityManagerFactory;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate53EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        return getDbmsName(entityManagerFactory, null, entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (factory == null && entityManagerFactory != null) {
-                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
-                    }
-                    if (factory != null) {
-                        return new HibernateJpa21Provider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpa21Provider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java
deleted file mode 100644
index 5aed327c0a..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53Integrator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.relational.Namespace;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate53Integrator implements Integrator {
-
-    @Override
-    public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        // TODO: remember metadata for exact column types
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        for (PersistentClass clazz : metadata.getEntityBindings()) {
-            Class<?> entityClass = clazz.getMappedClass();
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        TableNameFormatter formatter = new NativeTableNameFormatter(sessionFactory.getJdbcServices().getJdbcEnvironment().getQualifiedObjectNameFormatter());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(getTableIterator(metadata.getDatabase().getNamespaces()), sessionFactory.getDialect(), formatter, metadata));
-    }
-
-    private Iterator<Table> getTableIterator(Iterable<Namespace> namespaces) {
-        List<Iterator<Table>> iterators = new ArrayList<>();
-        Iterator<Namespace> namespaceIterator = namespaces.iterator();
-
-        while (namespaceIterator.hasNext()) {
-            iterators.add(namespaceIterator.next().getTables().iterator());
-        }
-
-        return new MultiIterator<>(iterators);
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java
deleted file mode 100644
index beabdd94b8..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate53LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private Integer limit;
-    private Integer offset;
-
-    public Hibernate53LimitHandler(Dialect dialect, DbmsDialect dbmsDialect) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String processSql(String sql, RowSelection selection) {
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(RowSelection selection, PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java
deleted file mode 100644
index 6695de1861..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate53LimitHandlingDialect extends Hibernate53DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate53LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return new Hibernate53LimitHandler(this, dbmsDialect);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java
deleted file mode 100644
index 2be23f30d5..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53MetadataContributor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.boot.spi.MetadataContributor;
-import org.hibernate.cfg.AnnotationBinder;
-import org.hibernate.cfg.InheritanceState;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.service.Service;
-import org.hibernate.service.spi.Configurable;
-import org.hibernate.service.spi.ServiceBinding;
-import org.jboss.jandex.IndexView;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(MetadataContributor.class)
-public class Hibernate53MetadataContributor implements MetadataContributor, Service, Configurable {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate53MetadataContributor.class.getName());
-    private Map<String, Object> configurationValues;
-
-    @Override
-    public void configure(Map configurationValues) {
-        this.configurationValues = configurationValues;
-    }
-
-    @Override
-    public void contribute(InFlightMetadataCollector metadataCollector, IndexView jandexIndex) {
-        ServiceBinding.ServiceLifecycleOwner lifecycleOwner = (ServiceBinding.ServiceLifecycleOwner) metadataCollector.getBootstrapContext().getServiceRegistry();
-        lifecycleOwner.configureService(new ServiceBinding<>(lifecycleOwner, Hibernate53MetadataContributor.class, this));
-        Object existingStrategy = configurationValues.get("hibernate.hql.bulk_id_strategy");
-        if (existingStrategy == null) {
-            JdbcServices jdbcService = metadataCollector.getBootstrapContext().getServiceRegistry().getService(JdbcServices.class);
-            MultiTableBulkIdStrategy defaultMultiTableBulkIdStrategy = jdbcService.getDialect().getDefaultMultiTableBulkIdStrategy();
-            configurationValues.put("hibernate.hql.bulk_id_strategy", new CustomMultiTableBulkIdStrategy(defaultMultiTableBulkIdStrategy));
-        } else {
-            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + existingStrategy);
-        }
-        // Skip if already registered
-        if (metadataCollector.getEntityBinding("com.blazebit.persistence.impl.function.entity.ValuesEntity") != null) {
-            return;
-        }
-
-        MetadataBuildingContext metadataBuildingContext = new MetadataBuildingContextRootImpl(
-                metadataCollector.getBootstrapContext(),
-                metadataCollector.getMetadataBuildingOptions(),
-                metadataCollector);
-
-        addEntity("com.blazebit.persistence.impl.function.entity.ValuesEntity", metadataBuildingContext);
-    }
-
-    private void addEntity(String className, MetadataBuildingContext metadataBuildingContext) {
-        try {
-            MetadataBuildingOptions options = metadataBuildingContext.getBuildingOptions();
-            Object /*ReflectionManager*/ reflectionManager = MetadataBuildingOptions.class.getMethod("getReflectionManager").invoke(options);
-            //            Object /*XClass*/ clazz = reflectionManager.classForName(className);
-            Method classForName = reflectionManager.getClass().getMethod("classForName", String.class);
-            Object /*XClass*/ clazz = classForName.invoke(reflectionManager, className);
-            Map<Object /*XClass*/, InheritanceState> inheritanceStatePerClass = new HashMap<Object /*XClass*/, InheritanceState>(1);
-
-            //        InheritanceState state = new InheritanceState(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            InheritanceState state = InheritanceState.class.getConstructor(classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .newInstance(clazz, inheritanceStatePerClass, metadataBuildingContext);
-
-            inheritanceStatePerClass.put(clazz, state);
-
-            //        AnnotationBinder.bindClass(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            AnnotationBinder.class.getMethod("bindClass", classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .invoke(null, clazz, inheritanceStatePerClass, metadataBuildingContext);
-        } catch (RuntimeException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not add entity", ex);
-        }
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java
deleted file mode 100644
index 2ff64e0ead..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53ServiceContributor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.spi.ServiceContributor;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ServiceContributor.class)
-public class Hibernate53ServiceContributor implements ServiceContributor {
-
-    @Override
-    public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
-        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(@SuppressWarnings("rawtypes") Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java
deleted file mode 100644
index 2d6ae19d28..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate53SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate53SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java
deleted file mode 100644
index 9e5f034d86..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate53SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate53SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate53SessionInvocationHandler(SessionImplementor delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
deleted file mode 100644
index 1d503d46b0..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.resource.transaction.spi.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5EntityTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate5EntityTransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getLocalSynchronizations();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        synchronizationRegistry.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
deleted file mode 100644
index 63c4c8bd91..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-/**
- * @author Moritz Becker
- * @since 1.4.0
- */
-public class Hibernate5JtaPlatformTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-
-    private final JtaPlatform jtaPlatform;
-    private final TransactionManager jtaTransactionManager;
-
-    public Hibernate5JtaPlatformTransactionSynchronizationStrategy(JtaPlatform jtaPlatform) {
-        this.jtaPlatform = jtaPlatform;
-        this.jtaTransactionManager = jtaPlatform.retrieveTransactionManager();
-    }
-
-    @Override
-    public boolean isActive() {
-        try {
-            return jtaPlatform.getCurrentStatus() == Status.STATUS_ACTIVE;
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        try {
-            jtaTransactionManager.setRollbackOnly();
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        jtaPlatform.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
deleted file mode 100644
index a9a4592359..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.hibernate.service.ServiceRegistry;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate5TransactionAccessFactory implements TransactionAccessFactory {
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        JtaPlatform jtaPlatform = getHibernate5JtaPlatformPresent(entityManager);
-        if (jtaPlatform == null || NoJtaPlatform.class == jtaPlatform.getClass()) {
-            return new Hibernate5EntityTransactionSynchronizationStrategy(entityManager);
-        } else {
-            return new Hibernate5JtaPlatformTransactionSynchronizationStrategy(jtaPlatform);
-        }
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
-    private static JtaPlatform getHibernate5JtaPlatformPresent(EntityManager em) {
-        Session hibernateSession = em.unwrap(Session.class);
-        SessionFactory hibernateSessionFactory = hibernateSession.getSessionFactory();
-        ServiceRegistry hibernateServiceRegistry = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry();
-        return hibernateServiceRegistry.getService(JtaPlatform.class);
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index c3690d897e..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-    
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
deleted file mode 100644
index ca9951a57e..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class NativeTableNameFormatter implements TableNameFormatter {
-
-    private final QualifiedObjectNameFormatter formatter;
-
-    public NativeTableNameFormatter(QualifiedObjectNameFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    @Override
-    public String getQualifiedTableName(Dialect dialect, Table table) {
-        return formatter.format(table.getQualifiedTableName(), dialect);
-    }
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index b14fa75d6c..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release(ps);
-                            session.getJdbcCoordinator().afterStatementExecution();
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index cb80278d05..0000000000
--- a/integration/hibernate-5.3/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final SessionFactoryOptions settings() {
-        return sessionFactoryImplementor.getSessionFactoryOptions();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getPhysicalConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return getJdbcService().getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{PreparedStatement.class}, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String incomingSql) {
-            final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getStatementInspector().inspect(incomingSql);
-            this.sql = inspectedSql == null ? incomingSql : inspectedSql;
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                getJdbcService().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementStart();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementEnd();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.getResourceRegistry().register(preparedStatement, true);
-            //          logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    private JdbcServices getJdbcService() {
-        return jdbcCoordinator
-                .getJdbcSessionOwner()
-                .getJdbcSessionContext()
-                .getServiceRegistry()
-                .getService(JdbcServices.class);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-5.4/pom.xml b/integration/hibernate-5.4/pom.xml
deleted file mode 100644
index 4abe857bc0..0000000000
--- a/integration/hibernate-5.4/pom.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5.4</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>${project.groupId}:blaze-persistence-integration-hibernate-5.3</include>
-                                </includes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate53Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate53EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate53Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate53MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate53ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/hibernate-5.5-jakarta/pom.xml b/integration/hibernate-5.5-jakarta/pom.xml
deleted file mode 100644
index 7e396b1554..0000000000
--- a/integration/hibernate-5.5-jakarta/pom.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-hibernate-5.5:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-5.5:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-5.5:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/hibernate-5.5/pom.xml b/integration/hibernate-5.5/pom.xml
deleted file mode 100644
index c31c5f7017..0000000000
--- a/integration/hibernate-5.5/pom.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5.5</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>${project.groupId}:blaze-persistence-integration-hibernate-5.3</include>
-                                </includes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate53Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate53EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate53Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate53MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate53ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/hibernate-5.6-jakarta/pom.xml b/integration/hibernate-5.6-jakarta/pom.xml
deleted file mode 100644
index bd41dab607..0000000000
--- a/integration/hibernate-5.6-jakarta/pom.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-hibernate-5.6:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-5.6:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-5.6:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/hibernate-5.6/pom.xml b/integration/hibernate-5.6/pom.xml
deleted file mode 100644
index 6eec83a770..0000000000
--- a/integration/hibernate-5.6/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5.6</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version.hibernate-5.6}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate56Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate56EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate56Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate56MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate56ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index bb8d895fe8..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    public CustomBasicCollectionPersister(Collection collectionBinding, CollectionDataAccess cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectCollectionLoader(
-            this,
-            subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-            subselect.getResult(),
-            subselect.getQueryParameters(),
-            subselect.getNamedParameterLocMap(),
-            session.getFactory(),
-            session.getLoadQueryInfluencers()
-        );
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index 23244e0e29..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess, MetadataImplementor metadata, SessionFactoryOptions sessionFactoryOptions) {
-        delegate.prepare(jdbcServices, connectionAccess, metadata, sessionFactoryOptions);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess, MetadataImplementor metadata, SessionFactoryOptions sessionFactoryOptions, SqlStringGenerationContext sqlStringGenerationContext) {
-        delegate.prepare(jdbcServices, connectionAccess, metadata, sessionFactoryOptions, sqlStringGenerationContext);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
-        delegate.release(jdbcServices, connectionAccess);
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index af88bbe813..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.OneToManyPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    public CustomOneToManyPersister(Collection collectionBinding, CollectionDataAccess cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SharedSessionContractImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index 2103744629..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index 3e4050b39c..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SharedSessionContractImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index 7365612b95..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(SharedSessionContractImplementor s, QueryParameters queryParameters) {
-        final SessionImplementor session = (SessionImplementor) s;
-        final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{SessionImplementor.class, EventSource.class}, new Hibernate56SessionInvocationHandler(session, jdbcCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Access.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Access.java
deleted file mode 100644
index df7dbaba07..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Access.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.spi.ExceptionConverter;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.query.internal.AbstractProducedQuery;
-import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.query.spi.QueryImplementor;
-import org.hibernate.query.spi.ScrollableResultsImplementor;
-import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
-import org.hibernate.resource.transaction.spi.TransactionCoordinator;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate56Access implements HibernateAccess {
-
-    private static final Method DO_EXECUTE_METHOD;
-    private static final Method DO_EXECUTE_METHOD_NEW;
-    private static final Constructor<ParameterTranslationsImpl> PARAMETER_TRANSLATIONS_CONSTRUCTOR;
-
-    static {
-        Method m = null;
-        Method mNew = null;
-        try {
-            m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SharedSessionContractImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-        } catch (Exception e) {
-            // As of Hibernate 5.4.21 the signature changed...
-            try {
-                mNew = BasicExecutor.class.getDeclaredMethod("doExecute", String.class, QueryParameters.class, List.class, SharedSessionContractImplementor.class);
-                mNew.setAccessible(true);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-        DO_EXECUTE_METHOD = m;
-        DO_EXECUTE_METHOD_NEW = mNew;
-        try {
-            Constructor<ParameterTranslationsImpl> c = ParameterTranslationsImpl.class.getDeclaredConstructor(List.class);
-            c.setAccessible(true);
-            PARAMETER_TRANSLATIONS_CONSTRUCTOR = c;
-        } catch (Exception ex) {
-            // As of Hibernate 5.4.21 the signature changed...
-            throw new RuntimeException(ex);
-        }
-    }
-    
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate56SessionInvocationHandler(session, jdbcCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    @Override
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate56LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate56SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            session.getJdbcCoordinator().afterTransaction();
-        }
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Stream<Object> performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResultsImplementor scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            if (DO_EXECUTE_METHOD == null) {
-                DO_EXECUTE_METHOD_NEW.invoke(executor, delete, parameters, parameterSpecifications, session);
-            } else {
-                DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((AbstractProducedQuery<?>) hibernateQuery).getQueryParameters();
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        return queryParameterBindings.collectNamedParameterBindings();
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        QueryParameterBindingsImpl queryParameterBindings = hibernateQuery.unwrap(QueryParameterBindingsImpl.class);
-        SharedSessionContractImplementor producer = (SharedSessionContractImplementor) ((QueryImplementor<?>) hibernateQuery).getProducer();
-        String query = hibernateQuery.getQueryString();
-
-        // NOTE: In Hibernate 5.3.0.CR1 this is call causes a side effect which is why this is essentially unusable for us
-        query = queryParameterBindings.expandListValuedParameters(query, producer);
-        return query;
-    }
-
-    private ExceptionConverter getExceptionConverter(EntityManager em) {
-        return em.unwrap(SharedSessionContractImplementor.class).getExceptionConverter();
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getExceptionConverter(em).convert(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                queryHints,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        try {
-            return PARAMETER_TRANSLATIONS_CONSTRUCTOR.newInstance(queryParameterSpecifications);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56DelegatingDialect.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56DelegatingDialect.java
deleted file mode 100644
index ec97e4470c..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56DelegatingDialect.java
+++ /dev/null
@@ -1,1015 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
-import org.hibernate.boot.model.relational.Sequence;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.identity.IdentityColumnSupport;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
-import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
-import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.loader.BatchLoadSizingStrategy;
-import org.hibernate.mapping.Constraint;
-import org.hibernate.mapping.ForeignKey;
-import org.hibernate.mapping.Index;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.procedure.spi.CallableStatementSupport;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
-import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate56DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate56DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public boolean isTypeNameRegistered(String typeName) {
-        return delegate.isTypeNameRegistered(typeName);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    @SuppressWarnings({ "rawtypes", "deprecation" })
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public IdentityColumnSupport getIdentityColumnSupport() {
-        return delegate.getIdentityColumnSupport();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public SequenceInformationExtractor getSequenceInformationExtractor() {
-        return delegate.getSequenceInformationExtractor();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return delegate.getLimitHandler();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString() {
-        return delegate.getForUpdateSkipLockedString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString(String aliases) {
-        return delegate.getForUpdateSkipLockedString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
-        return delegate.getDefaultMultiTableBulkIdStrategy();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, name);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
-        return delegate.getResultSet(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
-        return delegate.getResultSet(statement, name);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    @Deprecated
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
-        return delegate.buildIdentifierHelper(builder, dbMetaData);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public Exporter<Table> getTableExporter() {
-        return delegate.getTableExporter();
-    }
-
-    @Override
-    public Exporter<Sequence> getSequenceExporter() {
-        return delegate.getSequenceExporter();
-    }
-
-    @Override
-    public Exporter<Index> getIndexExporter() {
-        return delegate.getIndexExporter();
-    }
-
-    @Override
-    public Exporter<ForeignKey> getForeignKeyExporter() {
-        return delegate.getForeignKeyExporter();
-    }
-
-    @Override
-    public Exporter<Constraint> getUniqueKeyExporter() {
-        return delegate.getUniqueKeyExporter();
-    }
-
-    @Override
-    public Exporter<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectExporter() {
-        return delegate.getAuxiliaryDatabaseObjectExporter();
-    }
-
-    @Override
-    public boolean canCreateCatalog() {
-        return delegate.canCreateCatalog();
-    }
-
-    @Override
-    public String[] getCreateCatalogCommand(String catalogName) {
-        return delegate.getCreateCatalogCommand(catalogName);
-    }
-
-    @Override
-    public String[] getDropCatalogCommand(String catalogName) {
-        return delegate.getDropCatalogCommand(catalogName);
-    }
-
-    @Override
-    public boolean canCreateSchema() {
-        return delegate.canCreateSchema();
-    }
-
-    @Override
-    public String[] getCreateSchemaCommand(String schemaName) {
-        return delegate.getCreateSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String[] getDropSchemaCommand(String schemaName) {
-        return delegate.getDropSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String getCurrentSchemaCommand() {
-        return delegate.getCurrentSchemaCommand();
-    }
-
-    @Override
-    public SchemaNameResolver getSchemaNameResolver() {
-        return delegate.getSchemaNameResolver();
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getAddColumnSuffixString() {
-        return delegate.getAddColumnSuffixString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeConstraintName() {
-        return delegate.supportsIfExistsBeforeConstraintName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterConstraintName() {
-        return delegate.supportsIfExistsAfterConstraintName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public boolean requiresParensForTupleDistinctCounts() {
-        return delegate.requiresParensForTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getQueryHintString(String query, List<String> hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public ScrollMode defaultScrollMode() {
-        return delegate.defaultScrollMode();
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-
-    @Override
-    public CallableStatementSupport getCallableStatementSupport() {
-        return delegate.getCallableStatementSupport();
-    }
-
-    @Override
-    public NameQualifierSupport getNameQualifierSupport() {
-        return delegate.getNameQualifierSupport();
-    }
-
-    @Override
-    public BatchLoadSizingStrategy getDefaultBatchLoadSizingStrategy() {
-        return delegate.getDefaultBatchLoadSizingStrategy();
-    }
-
-    @Override
-    public boolean isJdbcLogWarningsEnabledByDefault() {
-        return delegate.isJdbcLogWarningsEnabledByDefault();
-    }
-
-    @Override
-    public void augmentRecognizedTableTypes(List<String> tableTypesList) {
-        delegate.augmentRecognizedTableTypes(tableTypesList);
-    }
-
-    @Override
-    public boolean equivalentTypes(int typeCode1, int typeCode2) {
-        return delegate.equivalentTypes(typeCode1, typeCode2);
-    }
-
-    @Override
-    public String getNativeIdentifierGeneratorStrategy() {
-        return delegate.getNativeIdentifierGeneratorStrategy();
-    }
-
-    @Override
-    public String getWriteLockString(String aliases, int timeout) {
-        return delegate.getWriteLockString(aliases, timeout);
-    }
-
-    @Override
-    public String getReadLockString(String aliases, int timeout) {
-        return delegate.getReadLockString(aliases, timeout);
-    }
-
-    @Override
-    public String getAlterTableString(String tableName) {
-        return delegate.getAlterTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsNoColumnsInsert() {
-        return delegate.supportsNoColumnsInsert();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String foreignKeyDefinition) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKeyDefinition);
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterAlterTable() {
-        return delegate.supportsIfExistsAfterAlterTable();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInSet() {
-        return delegate.supportsRowValueConstructorSyntaxInSet();
-    }
-
-    @Override
-    public boolean useFollowOnLocking(QueryParameters parameters) {
-        return delegate.useFollowOnLocking(parameters);
-    }
-
-    @Override
-    public String getQueryHintString(String query, String hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public boolean supportsNamedParameters(DatabaseMetaData databaseMetaData) throws SQLException {
-        return delegate.supportsNamedParameters(databaseMetaData);
-    }
-
-    @Override
-    public boolean supportsNationalizedTypes() {
-        return delegate.supportsNationalizedTypes();
-    }
-
-    @Override
-    public boolean supportsNonQueryWithCTE() {
-        return delegate.supportsNonQueryWithCTE();
-    }
-
-    @Override
-    public boolean supportsValuesList() {
-        return delegate.supportsValuesList();
-    }
-
-    @Override
-    public boolean supportsSkipLocked() {
-        return delegate.supportsSkipLocked();
-    }
-
-    @Override
-    public boolean supportsNoWait() {
-        return delegate.supportsNoWait();
-    }
-
-    @Override
-    public boolean isLegacyLimitHandlerBehaviorEnabled() {
-        return delegate.isLegacyLimitHandlerBehaviorEnabled();
-    }
-
-    @Override
-    public String inlineLiteral(String literal) {
-        return delegate.inlineLiteral(literal);
-    }
-
-    @Override
-    public boolean supportsJdbcConnectionLobCreation(DatabaseMetaData databaseMetaData) {
-        return delegate.supportsJdbcConnectionLobCreation(databaseMetaData);
-    }
-
-    @Override
-    public String addSqlHintOrComment(String sql, QueryParameters parameters, boolean commentsEnabled) {
-        return delegate.addSqlHintOrComment(sql, parameters, commentsEnabled);
-    }
-
-    @Override
-    public boolean supportsSelectAliasInGroupByClause() {
-        return delegate.supportsSelectAliasInGroupByClause();
-    }
-
-    @Override
-    public String getCreateTemporaryTableColumnAnnotation(int sqlTypeCode) {
-        return delegate.getCreateTemporaryTableColumnAnnotation(sqlTypeCode);
-    }
-
-    @Override
-    public boolean supportsPartitionBy() {
-        // NOTE: we can't delegate because this is called in constructor
-        return false;
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56EntityManagerFactoryIntegrator.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56EntityManagerFactoryIntegrator.java
deleted file mode 100644
index 77bfac6100..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.jpa.HibernateEntityManagerFactory;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate56EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        return getDbmsName(entityManagerFactory, null, entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (factory == null && entityManagerFactory != null) {
-                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
-                    }
-                    if (factory != null) {
-                        return new HibernateJpa21Provider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpa21Provider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Integrator.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Integrator.java
deleted file mode 100644
index 7e56319f14..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56Integrator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.relational.Namespace;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate56Integrator implements Integrator {
-
-    @Override
-    public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        // TODO: remember metadata for exact column types
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        for (PersistentClass clazz : metadata.getEntityBindings()) {
-            Class<?> entityClass = clazz.getMappedClass();
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        TableNameFormatter formatter = new NativeTableNameFormatter(sessionFactory.getJdbcServices().getJdbcEnvironment().getQualifiedObjectNameFormatter());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(getTableIterator(metadata.getDatabase().getNamespaces()), sessionFactory.getDialect(), formatter, metadata));
-    }
-
-    private Iterator<Table> getTableIterator(Iterable<Namespace> namespaces) {
-        List<Iterator<Table>> iterators = new ArrayList<>();
-        Iterator<Namespace> namespaceIterator = namespaces.iterator();
-
-        while (namespaceIterator.hasNext()) {
-            iterators.add(namespaceIterator.next().getTables().iterator());
-        }
-
-        return new MultiIterator<>(iterators);
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandler.java
deleted file mode 100644
index e0f9d42634..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate56LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private Integer limit;
-    private Integer offset;
-
-    public Hibernate56LimitHandler(Dialect dialect, DbmsDialect dbmsDialect) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String processSql(String sql, RowSelection selection) {
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(RowSelection selection, PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandlingDialect.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandlingDialect.java
deleted file mode 100644
index 66d8e0b29d..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate56LimitHandlingDialect extends Hibernate56DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate56LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return new Hibernate56LimitHandler(this, dbmsDialect);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56MetadataContributor.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56MetadataContributor.java
deleted file mode 100644
index 59dc0f9c2f..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56MetadataContributor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.boot.spi.MetadataContributor;
-import org.hibernate.cfg.AnnotationBinder;
-import org.hibernate.cfg.InheritanceState;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.service.Service;
-import org.hibernate.service.spi.Configurable;
-import org.hibernate.service.spi.ServiceBinding;
-import org.jboss.jandex.IndexView;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(MetadataContributor.class)
-public class Hibernate56MetadataContributor implements MetadataContributor, Service, Configurable {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate56MetadataContributor.class.getName());
-    private Map<String, Object> configurationValues;
-
-    @Override
-    public void configure(Map configurationValues) {
-        this.configurationValues = configurationValues;
-    }
-
-    @Override
-    public void contribute(InFlightMetadataCollector metadataCollector, IndexView jandexIndex) {
-        ServiceBinding.ServiceLifecycleOwner lifecycleOwner = (ServiceBinding.ServiceLifecycleOwner) metadataCollector.getBootstrapContext().getServiceRegistry();
-        lifecycleOwner.configureService(new ServiceBinding<>(lifecycleOwner, Hibernate56MetadataContributor.class, this));
-        Object existingStrategy = configurationValues.get("hibernate.hql.bulk_id_strategy");
-        if (existingStrategy == null) {
-            JdbcServices jdbcService = metadataCollector.getBootstrapContext().getServiceRegistry().getService(JdbcServices.class);
-            MultiTableBulkIdStrategy defaultMultiTableBulkIdStrategy = jdbcService.getDialect().getDefaultMultiTableBulkIdStrategy();
-            configurationValues.put("hibernate.hql.bulk_id_strategy", new CustomMultiTableBulkIdStrategy(defaultMultiTableBulkIdStrategy));
-        } else {
-            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + existingStrategy);
-        }
-        // Skip if already registered
-        if (metadataCollector.getEntityBinding("com.blazebit.persistence.impl.function.entity.ValuesEntity") != null) {
-            return;
-        }
-
-        MetadataBuildingContext metadataBuildingContext = new MetadataBuildingContextRootImpl(
-                metadataCollector.getBootstrapContext(),
-                metadataCollector.getMetadataBuildingOptions(),
-                metadataCollector);
-
-        addEntity("com.blazebit.persistence.impl.function.entity.ValuesEntity", metadataBuildingContext);
-    }
-
-    private void addEntity(String className, MetadataBuildingContext metadataBuildingContext) {
-        try {
-            MetadataBuildingOptions options = metadataBuildingContext.getBuildingOptions();
-            Object /*ReflectionManager*/ reflectionManager = MetadataBuildingOptions.class.getMethod("getReflectionManager").invoke(options);
-            //            Object /*XClass*/ clazz = reflectionManager.classForName(className);
-            Method classForName = reflectionManager.getClass().getMethod("classForName", String.class);
-            Object /*XClass*/ clazz = classForName.invoke(reflectionManager, className);
-            Map<Object /*XClass*/, InheritanceState> inheritanceStatePerClass = new HashMap<Object /*XClass*/, InheritanceState>(1);
-
-            //        InheritanceState state = new InheritanceState(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            InheritanceState state = InheritanceState.class.getConstructor(classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .newInstance(clazz, inheritanceStatePerClass, metadataBuildingContext);
-
-            inheritanceStatePerClass.put(clazz, state);
-
-            //        AnnotationBinder.bindClass(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            AnnotationBinder.class.getMethod("bindClass", classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .invoke(null, clazz, inheritanceStatePerClass, metadataBuildingContext);
-        } catch (RuntimeException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not add entity", ex);
-        }
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56ServiceContributor.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56ServiceContributor.java
deleted file mode 100644
index 29157ee878..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56ServiceContributor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.spi.ServiceContributor;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ServiceContributor.class)
-public class Hibernate56ServiceContributor implements ServiceContributor {
-
-    @Override
-    public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
-        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(@SuppressWarnings("rawtypes") Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionFactoryInvocationHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionFactoryInvocationHandler.java
deleted file mode 100644
index 5c6196cc67..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate56SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate56SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionInvocationHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionInvocationHandler.java
deleted file mode 100644
index a0abd0cb46..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate56SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate56SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate56SessionInvocationHandler(SessionImplementor delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
deleted file mode 100644
index 1d503d46b0..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.resource.transaction.spi.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5EntityTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate5EntityTransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getLocalSynchronizations();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        synchronizationRegistry.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
deleted file mode 100644
index 63c4c8bd91..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-/**
- * @author Moritz Becker
- * @since 1.4.0
- */
-public class Hibernate5JtaPlatformTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-
-    private final JtaPlatform jtaPlatform;
-    private final TransactionManager jtaTransactionManager;
-
-    public Hibernate5JtaPlatformTransactionSynchronizationStrategy(JtaPlatform jtaPlatform) {
-        this.jtaPlatform = jtaPlatform;
-        this.jtaTransactionManager = jtaPlatform.retrieveTransactionManager();
-    }
-
-    @Override
-    public boolean isActive() {
-        try {
-            return jtaPlatform.getCurrentStatus() == Status.STATUS_ACTIVE;
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        try {
-            jtaTransactionManager.setRollbackOnly();
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        jtaPlatform.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
deleted file mode 100644
index a9a4592359..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.hibernate.service.ServiceRegistry;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate5TransactionAccessFactory implements TransactionAccessFactory {
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        JtaPlatform jtaPlatform = getHibernate5JtaPlatformPresent(entityManager);
-        if (jtaPlatform == null || NoJtaPlatform.class == jtaPlatform.getClass()) {
-            return new Hibernate5EntityTransactionSynchronizationStrategy(entityManager);
-        } else {
-            return new Hibernate5JtaPlatformTransactionSynchronizationStrategy(jtaPlatform);
-        }
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
-    private static JtaPlatform getHibernate5JtaPlatformPresent(EntityManager em) {
-        Session hibernateSession = em.unwrap(Session.class);
-        SessionFactory hibernateSessionFactory = hibernateSession.getSessionFactory();
-        ServiceRegistry hibernateServiceRegistry = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry();
-        return hibernateServiceRegistry.getService(JtaPlatform.class);
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index c3690d897e..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-    
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
deleted file mode 100644
index ca9951a57e..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class NativeTableNameFormatter implements TableNameFormatter {
-
-    private final QualifiedObjectNameFormatter formatter;
-
-    public NativeTableNameFormatter(QualifiedObjectNameFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    @Override
-    public String getQualifiedTableName(Dialect dialect, Table table) {
-        return formatter.format(table.getQualifiedTableName(), dialect);
-    }
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index b14fa75d6c..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release(ps);
-                            session.getJdbcCoordinator().afterStatementExecution();
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index cb80278d05..0000000000
--- a/integration/hibernate-5.6/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final SessionFactoryOptions settings() {
-        return sessionFactoryImplementor.getSessionFactoryOptions();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getPhysicalConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return getJdbcService().getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{PreparedStatement.class}, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String incomingSql) {
-            final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getStatementInspector().inspect(incomingSql);
-            this.sql = inspectedSql == null ? incomingSql : inspectedSql;
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                getJdbcService().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementStart();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementEnd();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.getResourceRegistry().register(preparedStatement, true);
-            //          logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    private JdbcServices getJdbcService() {
-        return jdbcCoordinator
-                .getJdbcSessionOwner()
-                .getJdbcSessionContext()
-                .getServiceRegistry()
-                .getService(JdbcServices.class);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-5/.gitignore b/integration/hibernate-5/.gitignore
deleted file mode 100644
index 1dd3331081..0000000000
--- a/integration/hibernate-5/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/target/
diff --git a/integration/hibernate-5/pom.xml b/integration/hibernate-5/pom.xml
deleted file mode 100644
index c8ddb2bb3e..0000000000
--- a/integration/hibernate-5/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate 5</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <!-- Minimum version is 5.0.0.Final -->
-            <version>5.0.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate5Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate5EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate5Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate5MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate5ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
deleted file mode 100644
index a791354b51..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomBasicCollectionPersister.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.BasicCollectionPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomBasicCollectionPersister extends BasicCollectionPersister implements CustomCollectionPersister {
-
-    public CustomBasicCollectionPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectCollectionLoader(
-            this,
-            subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-            subselect.getResult(),
-            subselect.getQueryParameters(),
-            subselect.getNamedParameterLocMap(),
-            session.getFactory(),
-            session.getLoadQueryInfluencers()
-        );
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
deleted file mode 100644
index ac9b9525b9..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomMultiTableBulkIdStrategy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomMultiTableBulkIdStrategy implements MultiTableBulkIdStrategy {
-
-    private static final Logger LOG = Logger.getLogger(CustomMultiTableBulkIdStrategy.class.getName());
-    private final MultiTableBulkIdStrategy delegate;
-
-    public CustomMultiTableBulkIdStrategy(MultiTableBulkIdStrategy delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public UpdateHandler buildUpdateHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        UpdateHandler updateHandler = delegate.buildUpdateHandler(factory, walker);
-
-        final UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        final FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        final AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-
-        // Only do this when we have secondary tables
-        if (targetedPersister.getConstraintOrderedTableNameClosure().length > 1) {
-            if (updateHandler instanceof TableBasedUpdateHandlerImpl) {
-                return new CustomTableBasedUpdateHandlerImpl((TableBasedUpdateHandlerImpl) updateHandler, walker);
-            } else {
-                LOG.warning("Unsupported update handler that can't be adapted to support updates to secondary tables: " + updateHandler);
-            }
-        }
-
-        return updateHandler;
-    }
-
-    @Override
-    public DeleteHandler buildDeleteHandler(SessionFactoryImplementor factory, HqlSqlWalker walker) {
-        return delegate.buildDeleteHandler(factory, walker);
-    }
-
-    @Override
-    public void prepare(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess, MetadataImplementor metadata, SessionFactoryOptions sessionFactoryOptions) {
-        delegate.prepare(jdbcServices, connectionAccess, metadata, sessionFactoryOptions);
-    }
-
-    @Override
-    public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAccess) {
-        delegate.release(jdbcServices, connectionAccess);
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
deleted file mode 100644
index c5de4ef005..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomOneToManyPersister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.CustomCollectionPersister;
-import org.hibernate.MappingException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
-import org.hibernate.loader.collection.CollectionInitializer;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.OneToManyPersister;
-import org.hibernate.persister.spi.PersisterCreationContext;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomOneToManyPersister extends OneToManyPersister implements CustomCollectionPersister {
-
-    public CustomOneToManyPersister(Collection collectionBinding, CollectionRegionAccessStrategy cacheAccessStrategy, PersisterCreationContext creationContext) throws MappingException, CacheException {
-        super(collectionBinding, cacheAccessStrategy, creationContext);
-    }
-
-    @Override
-    protected CollectionInitializer createSubselectInitializer(SubselectFetch subselect, SessionImplementor session) {
-        return new CustomSubselectOneToManyLoader(
-                this,
-                subselect.toSubselectString( getCollectionType().getLHSPropertyName() ),
-                subselect.getResult(),
-                subselect.getQueryParameters(),
-                subselect.getNamedParameterLocMap(),
-                session.getFactory(),
-                session.getLoadQueryInfluencers()
-        );
-    }
-}
\ No newline at end of file
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
deleted file mode 100644
index 73b07e97a9..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.mapping.Collection;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.internal.StandardPersisterClassResolver;
-import org.hibernate.persister.spi.PersisterClassResolver;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-@ServiceProvider(PersisterClassResolver.class)
-public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
-
-    @Override
-    public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-        return metadata.isOneToMany() ? CustomOneToManyPersister.class : CustomBasicCollectionPersister.class;
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
deleted file mode 100644
index 9a8b10850d..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectCollectionLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectCollectionLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.0
- */
-public class CustomSubselectCollectionLoader extends SubselectCollectionLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectCollectionLoader(QueryableCollection persister, String subquery, Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
deleted file mode 100644
index 40cf98392f..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomSubselectOneToManyLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.loader.collection.SubselectOneToManyLoader;
-import org.hibernate.persister.collection.QueryableCollection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static com.blazebit.persistence.integration.hibernate.base.SubselectLoaderUtils.getPreparedStatementProxy;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class CustomSubselectOneToManyLoader extends SubselectOneToManyLoader {
-
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public CustomSubselectOneToManyLoader(QueryableCollection persister, String subquery, java.util.Collection entityKeys, QueryParameters queryParameters, Map<String, int[]> namedParameterLocMap, SessionFactoryImplementor factory, LoadQueryInfluencers loadQueryInfluencers) throws MappingException {
-        super(persister, subquery, entityKeys, queryParameters, namedParameterLocMap, factory, loadQueryInfluencers);
-        String originalSql = queryParameters.getFilteredSQL();
-        if (originalSql.startsWith("with ")) {
-            StringBuilder sb = new StringBuilder(sql.length() + originalSql.length());
-            cteParameterCount = SubselectLoaderUtils.applyCteAndCountParameters(originalSql, sb);
-            selectParameterCount = SubselectLoaderUtils.countSelectParameters(originalSql, sb.length());
-            sb.append(sql);
-            this.sql = sb.toString();
-        } else {
-            cteParameterCount = 0;
-            selectParameterCount = 0;
-        }
-    }
-
-    @Override
-    protected int bindParameterValues(PreparedStatement statement, QueryParameters queryParameters, int startIndex, SessionImplementor session) throws SQLException {
-        if (cteParameterCount > 0) {
-            statement = getPreparedStatementProxy(statement, queryParameters, cteParameterCount, selectParameterCount);
-        }
-        return super.bindParameterValues(statement, queryParameters, startIndex, session);
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
deleted file mode 100644
index 7cc2a1c2b7..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/CustomTableBasedUpdateHandlerImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.HqlSqlWalker;
-import org.hibernate.hql.internal.ast.tree.AssignmentSpecification;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.UpdateStatement;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.TableBasedUpdateHandlerImpl;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CustomTableBasedUpdateHandlerImpl implements MultiTableBulkIdStrategy.UpdateHandler {
-
-    private final TableBasedUpdateHandlerImpl delegate;
-    private final String[] secondaryTableUpdates;
-    private final String[] secondaryTableInserts;
-
-    public CustomTableBasedUpdateHandlerImpl(TableBasedUpdateHandlerImpl delegate, HqlSqlWalker walker) {
-        this.delegate = delegate;
-        // Here comes the madness...
-        // We need to somehow execute our code within the temporary table scope, but since there is no way for use to do this externally,
-        // we need to use invocation handlers to get a callback at the right time
-        // First, we reduce the update statements
-        String[] updates = delegate.getSqlStatements();
-        UpdateStatement updateStatement = (UpdateStatement) walker.getAST();
-        FromElement fromElement = updateStatement.getFromClause().getFromElement();
-        AbstractEntityPersister targetedPersister = (AbstractEntityPersister) fromElement.getQueryable();
-        String[] tableNames = targetedPersister.getConstraintOrderedTableNameClosure();
-        String[][] columnNames = targetedPersister.getContraintOrderedTableKeyColumnClosure();
-
-        int subclassCount = delegate.getTargetedQueryable().getEntityMetamodel().getSubclassEntityNames().size();
-        Set<String> subclassTableNames = new HashSet<>();
-        for (int i = 0; i < subclassCount; i++) {
-            subclassTableNames.add(delegate.getTargetedQueryable().getSubclassTableName(i));
-        }
-
-        final String[] secondaryTableUpdates = updates.clone();
-        final String[] secondaryTableInserts = new String[updates.length];
-
-        StringBuilder sb = new StringBuilder();
-        StringBuilder selectSb = new StringBuilder();
-        String selectString = "select ";
-        String inString = "IN (";
-        for (int tableIndex = 0; tableIndex < tableNames.length; tableIndex++) {
-            if (updates[tableIndex] != null) {
-                // We introduce a dummy update statement that we react upon
-                if (subclassTableNames.contains(tableNames[tableIndex])) {
-                    secondaryTableUpdates[tableIndex] = null;
-                } else {
-                    sb.setLength(0);
-                    selectSb.setLength(0);
-
-                    boolean affected = false;
-                    String idSubselect = updates[tableIndex].substring(updates[tableIndex].lastIndexOf(inString) + inString.length(), updates[tableIndex].length() - 1);
-
-                    sb.append("insert into ").append(tableNames[tableIndex]);
-                    String[] keyColumnNames = columnNames[tableIndex];
-                    sb.append('(');
-
-                    final List<AssignmentSpecification> assignmentSpecifications = walker.getAssignmentSpecifications();
-                    for (AssignmentSpecification assignmentSpecification : assignmentSpecifications) {
-                        if (assignmentSpecification.affectsTable(tableNames[tableIndex])) {
-                            String sqlAssignmentFragment = assignmentSpecification.getSqlAssignmentFragment();
-                            int eqIndex = sqlAssignmentFragment.indexOf('=');
-                            sb.append(sqlAssignmentFragment, 0, eqIndex);
-                            sb.append(',');
-                            selectSb.append(sqlAssignmentFragment, eqIndex + 1, sqlAssignmentFragment.length());
-                            selectSb.append(',');
-
-                            affected = true;
-                        }
-                    }
-                    if (affected) {
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append(keyColumnNames[i]);
-                            sb.append(',');
-                        }
-                        sb.setCharAt(sb.length() - 1, ')');
-                        sb.append(' ').append(selectString);
-                        sb.append(selectSb);
-                        sb.append(idSubselect, selectString.length(), idSubselect.length());
-                        sb.append(" where not exists (select 1 from ");
-                        sb.append(tableNames[tableIndex]);
-                        sb.append(" a where ");
-
-                        for (int i = 0; i < keyColumnNames.length; i++) {
-                            sb.append("a.");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" = ");
-                            sb.append(keyColumnNames[i]);
-                            sb.append(" and ");
-                        }
-
-                        sb.setLength(sb.length() - " and ".length());
-                        sb.append(")");
-
-                        secondaryTableInserts[tableIndex] = sb.toString();
-                    }
-
-                    updates[tableIndex] = "";
-                }
-            }
-        }
-
-        this.secondaryTableUpdates = secondaryTableUpdates;
-        this.secondaryTableInserts = secondaryTableInserts;
-    }
-
-    @Override
-    public int execute(final SessionImplementor session, QueryParameters queryParameters) {
-        final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{JdbcCoordinator.class}, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new DelegatingStatementPreparerImpl(jdbcCoordinator.getStatementPreparer()) {
-            PreparedStatement statementProxy;
-            SecondaryTableUpdateSupportingPreparedStatementInvocationHandler invocationHandler;
-
-            @Override
-            public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-                if (sql.isEmpty()) {
-                    // Return the statement proxy which collects parameters and then executes update/insert statements for secondary tables
-                    invocationHandler.prepareNext();
-                    return statementProxy;
-                } else {
-                    PreparedStatement insertStatement = super.prepareStatement(sql, isCallable);
-                    this.invocationHandler = new SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(session, jdbcCoordinator.getStatementPreparer(), insertStatement, secondaryTableUpdates, secondaryTableInserts);
-                    this.statementProxy = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, invocationHandler);
-                    return statementProxy;
-                }
-            }
-        }));
-        SessionImplementor sessionProxy = (SessionImplementor) Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{SessionImplementor.class, EventSource.class}, new Hibernate5SessionInvocationHandler(session, jdbcCoordinatorProxy));
-
-        return delegate.execute(sessionProxy, queryParameters);
-    }
-
-    @Override
-    public Queryable getTargetedQueryable() {
-        return delegate.getTargetedQueryable();
-    }
-
-    @Override
-    public String[] getSqlStatements() {
-        return delegate.getSqlStatements();
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
deleted file mode 100644
index d7033d85ea..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/DelegatingStatementPreparerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.ScrollMode;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class DelegatingStatementPreparerImpl implements StatementPreparer {
-
-    private StatementPreparer delegate;
-
-    public DelegatingStatementPreparerImpl(StatementPreparer delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Statement createStatement() {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, boolean isCallable) {
-        return delegate.prepareStatement(sql, isCallable);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, boolean isCallable, ScrollMode scrollMode) {
-        return delegate.prepareQueryStatement(sql, isCallable, scrollMode);
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java
deleted file mode 100644
index a150f3b933..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Access.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-import com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ScrollableResultsIterator;
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.reflection.ReflectionUtils;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.ejb.HibernateEntityManagerImplementor;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.query.spi.ParameterMetadata;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.hql.internal.ast.ParameterTranslationsImpl;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.internal.classic.ParserHelper;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.resource.transaction.TransactionCoordinator;
-import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.logging.Logger;
-import java.util.stream.StreamSupport;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(HibernateAccess.class)
-public class Hibernate5Access implements HibernateAccess {
-
-    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
-    private static final Method DO_EXECUTE_METHOD;
-
-    static {
-        try {
-            Method m = BasicExecutor.class.getDeclaredMethod("doExecute", QueryParameters.class, SessionImplementor.class, String.class, List.class);
-            m.setAccessible(true);
-            DO_EXECUTE_METHOD = m;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-    
-    @Override
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-        
-        Object jdbcCoordinatorProxy = Proxy.newProxyInstance(jdbcCoordinator.getClass().getClassLoader(), new Class[]{ JdbcCoordinator.class }, new JdbcCoordinatorInvocationHandler(jdbcCoordinator, new StatementPreparerImpl(jdbcCoordinator, session.getFactory(), dbmsDialect, columns, returningSqlTypes, returningResult)));
-        Object sessionProxy = Proxy.newProxyInstance(session.getClass().getClassLoader(), new Class[]{ SessionImplementor.class, EventSource.class }, new Hibernate5SessionInvocationHandler(session, jdbcCoordinatorProxy));
-        return (SessionImplementor) sessionProxy;
-    }
-
-    @Override
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect) {
-        Object dialectProxy = new Hibernate5LimitHandlingDialect(sessionFactory.getDialect(), dbmsDialect);
-        Object sessionFactoryProxy = Proxy.newProxyInstance(sessionFactory.getClass().getClassLoader(), new Class[]{ SessionFactoryImplementor.class }, new Hibernate5SessionFactoryInvocationHandler(sessionFactory, dialectProxy));
-        return (SessionFactoryImplementor) sessionFactoryProxy;
-    }
-
-    @Override
-    public void checkTransactionSynchStatus(SessionImplementor session) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        coordinator.pulse();
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    public void afterTransaction(SessionImplementor session, boolean success) {
-        TransactionCoordinator coordinator = session.getTransactionCoordinator();
-        if (!session.isTransactionInProgress() ) {
-            session.getJdbcCoordinator().afterTransaction();
-        }
-        if (coordinator instanceof JtaTransactionCoordinatorImpl) {
-            ((JtaTransactionCoordinatorImpl) coordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
-        }
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryLoader.list(sessionImplementor, queryParameters);
-    }
-
-    @Override
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performExecuteUpdate(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        return queryPlan.performList(queryParameters, sessionImplementor);
-    }
-
-    @Override
-    public Object performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters) {
-        final ScrollableResults scrollableResults = queryPlan.performScroll(queryParameters, sessionImplementor);
-        final Iterator<Object> iterator = new ScrollableResultsIterator(scrollableResults);
-        final Spliterator<Object> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);
-        return StreamSupport.stream(spliterator, false).onClose(new Runnable() {
-            @Override
-            public void run() {
-                scrollableResults.close();
-            }
-        });
-    }
-
-    @Override
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications) {
-        try {
-            DO_EXECUTE_METHOD.invoke(executor, parameters, session, delete, parameterSpecifications);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams) {
-        return ((org.hibernate.internal.AbstractQueryImpl) hibernateQuery).getQueryParameters(namedParams);
-    }
-
-    @Override
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameters");
-    }
-
-    @Override
-    public String expandParameterLists(SessionImplementor session, org.hibernate.Query hibernateQuery, Map<String, TypedValue> namedParamsCopy) {
-        String query = hibernateQuery.getQueryString();
-        ParameterMetadata parameterMetadata = getParameterMetadata(hibernateQuery);
-        Iterator<Map.Entry<String, TypedValue>> iter = getNamedParamLists(hibernateQuery).entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, TypedValue> me = iter.next();
-            query = expandParameterList(session, parameterMetadata, query, (String) me.getKey(), (TypedValue) me.getValue(), namedParamsCopy);
-        }
-        return query;
-    }
-
-    private ParameterMetadata getParameterMetadata(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "parameterMetadata");
-    }
-
-    private Map<String, TypedValue> getNamedParamLists(org.hibernate.Query hibernateQuery) {
-        return getField(hibernateQuery, "namedParameterLists");
-    }
-
-    private String expandParameterList(SessionImplementor session, ParameterMetadata parameterMetadata, String query, String name, TypedValue typedList, Map<String, TypedValue> namedParamsCopy) {
-        Collection<?> vals = (Collection<?>) typedList.getValue();
-
-        // HHH-1123
-        // Some DBs limit number of IN expressions.  For now, warn...
-        final Dialect dialect = session.getFactory().getDialect();
-        final int inExprLimit = dialect.getInExpressionCountLimit();
-        if (inExprLimit > 0 && vals.size() > inExprLimit) {
-            LOG.warning(String.format("Dialect [%s] limits the number of elements in an IN predicate to %s entries.  " +
-                    "However, the given parameter list [%s] contained %s entries, which will likely cause failures " +
-                    "to execute the query in the database", dialect.getClass().getName(), inExprLimit, name, vals.size()));
-        }
-
-        Type type = typedList.getType();
-
-        boolean isJpaPositionalParam = parameterMetadata.getNamedParameterDescriptor(name).isJpaStyle();
-        String paramPrefix = isJpaPositionalParam ? "?" : ParserHelper.HQL_VARIABLE_PREFIX;
-        String placeholder =
-                new StringBuilder(paramPrefix.length() + name.length())
-                        .append(paramPrefix).append(name)
-                        .toString();
-
-        if (query == null) {
-            return query;
-        }
-        int loc = query.indexOf(placeholder);
-
-        if (loc < 0) {
-            return query;
-        }
-
-        String beforePlaceholder = query.substring(0, loc);
-        String afterPlaceholder =  query.substring(loc + placeholder.length());
-
-        // check if placeholder is already immediately enclosed in parentheses
-        // (ignoring whitespace)
-        boolean isEnclosedInParens =
-                StringHelper.getLastNonWhitespaceCharacter(beforePlaceholder) == '(' &&
-                        StringHelper.getFirstNonWhitespaceCharacter(afterPlaceholder) == ')';
-
-        if (vals.size() == 1  && isEnclosedInParens) {
-            // short-circuit for performance when only 1 value and the
-            // placeholder is already enclosed in parentheses...
-            namedParamsCopy.put(name, new TypedValue(type, vals.iterator().next()));
-            return query;
-        }
-
-        StringBuilder list = new StringBuilder(16);
-        Iterator<?> iter = vals.iterator();
-        int i = 0;
-        while (iter.hasNext()) {
-            // Variable 'name' can represent a number or contain digit at the end. Surrounding it with
-            // characters to avoid ambiguous definition after concatenating value of 'i' counter.
-            String alias = (isJpaPositionalParam ? 'x' + name : name) + '_' + i++ + '_';
-            if (namedParamsCopy.put(alias, new TypedValue(type, iter.next())) != null) {
-                throw new HibernateException("Repeated usage of alias '" + alias + "' while expanding list parameter.");
-            }
-            list.append(ParserHelper.HQL_VARIABLE_PREFIX).append(alias);
-            if (iter.hasNext()) {
-                list.append(", ");
-            }
-        }
-        return StringHelper.replace(
-                beforePlaceholder,
-                afterPlaceholder,
-                placeholder.toString(),
-                list.toString(),
-                true,
-                true
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T getField(Object object, String field) {
-        boolean madeAccessible = false;
-        Field f = null;
-        try {
-            f = ReflectionUtils.getField(object.getClass(), field);
-            madeAccessible = !f.isAccessible();
-
-            if (madeAccessible) {
-                f.setAccessible(true);
-            }
-            return (T) f.get(object);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        } finally {
-            if (madeAccessible) {
-                f.setAccessible(false);
-            }
-        }
-    }
-
-    private HibernateEntityManagerImplementor getEntityManager(EntityManager em) {
-        return (HibernateEntityManagerImplementor) em.unwrap(EntityManager.class);
-    }
-
-    @Override
-    public RuntimeException convert(EntityManager em, HibernateException e) {
-        return getEntityManager(em).convert(e);
-    }
-
-    @Override
-    public void handlePersistenceException(EntityManager em, PersistenceException e) {
-        getEntityManager(em).handlePersistenceException(e);
-    }
-
-    @Override
-    public void throwPersistenceException(EntityManager em, HibernateException e) {
-        getEntityManager(em).throwPersistenceException(e);
-    }
-
-    @Override
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys) {
-        return new QueryParameters(
-                positionalParameterTypes,
-                positionalParameterValues,
-                namedParameters,
-                lockOptions,
-                rowSelection,
-                isReadOnlyInitialized,
-                readOnly,
-                cacheable,
-                cacheRegion,
-                comment,
-                queryHints,
-                collectionKeys,
-                null
-        );
-    }
-
-    @Override
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications) {
-        return new ParameterTranslationsImpl(queryParameterSpecifications);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5DelegatingDialect.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5DelegatingDialect.java
deleted file mode 100644
index 4f63ba8d46..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5DelegatingDialect.java
+++ /dev/null
@@ -1,901 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.NullPrecedence;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
-import org.hibernate.boot.model.relational.Sequence;
-import org.hibernate.dialect.ColumnAliasExtractor;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.LobMergeStrategy;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
-import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
-import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConverter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.mapping.Constraint;
-import org.hibernate.mapping.ForeignKey;
-import org.hibernate.mapping.Index;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.entity.Lockable;
-import org.hibernate.procedure.spi.CallableStatementSupport;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.JoinFragment;
-import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
-import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5DelegatingDialect extends Dialect {
-
-    private final Dialect delegate;
-
-    public Hibernate5DelegatingDialect(Dialect delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-        delegate.contributeTypes(typeContributions, serviceRegistry);
-    }
-
-    @Override
-    public String getTypeName(int code) throws HibernateException {
-        return delegate.getTypeName(code);
-    }
-
-    @Override
-    public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
-        return delegate.getTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    public String getCastTypeName(int code) {
-        return delegate.getCastTypeName(code);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, length, precision, scale);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int length) {
-        return delegate.cast(value, jdbcTypeCode, length);
-    }
-
-    @Override
-    public String cast(String value, int jdbcTypeCode, int precision, int scale) {
-        return delegate.cast(value, jdbcTypeCode, precision, scale);
-    }
-
-    @Override
-    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
-        return delegate.remapSqlTypeDescriptor(sqlTypeDescriptor);
-    }
-
-    @Override
-    public LobMergeStrategy getLobMergeStrategy() {
-        return delegate.getLobMergeStrategy();
-    }
-
-    @Override
-    public String getHibernateTypeName(int code) throws HibernateException {
-        return delegate.getHibernateTypeName(code);
-    }
-
-    @Override
-    public String getHibernateTypeName(int code, int length, int precision, int scale) throws HibernateException {
-        return delegate.getHibernateTypeName(code, length, precision, scale);
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Class getNativeIdentifierGeneratorClass() {
-        return delegate.getNativeIdentifierGeneratorClass();
-    }
-
-    @Override
-    public boolean supportsIdentityColumns() {
-        return delegate.supportsIdentityColumns();
-    }
-
-    @Override
-    public boolean supportsInsertSelectIdentity() {
-        return delegate.supportsInsertSelectIdentity();
-    }
-
-    @Override
-    public boolean hasDataTypeInIdentityColumn() {
-        return delegate.hasDataTypeInIdentityColumn();
-    }
-
-    @Override
-    public String appendIdentitySelectToInsert(String insertString) {
-        return delegate.appendIdentitySelectToInsert(insertString);
-    }
-
-    @Override
-    public String getIdentitySelectString(String table, String column, int type) throws MappingException {
-        return delegate.getIdentitySelectString(table, column, type);
-    }
-
-    @Override
-    public String getIdentityColumnString(int type) throws MappingException {
-        return delegate.getIdentityColumnString(type);
-    }
-
-    @Override
-    public String getIdentityInsertString() {
-        return delegate.getIdentityInsertString();
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return delegate.supportsSequences();
-    }
-
-    @Override
-    public boolean supportsPooledSequences() {
-        return delegate.supportsPooledSequences();
-    }
-
-    @Override
-    public String getSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) throws MappingException {
-        return delegate.getSelectSequenceNextValString(sequenceName);
-    }
-
-    @Override
-    @Deprecated
-    public String[] getCreateSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize) throws MappingException {
-        return delegate.getCreateSequenceStrings(sequenceName, initialValue, incrementSize);
-    }
-
-    @Override
-    public String[] getDropSequenceStrings(String sequenceName) throws MappingException {
-        return delegate.getDropSequenceStrings(sequenceName);
-    }
-
-    @Override
-    public String getQuerySequencesString() {
-        return delegate.getQuerySequencesString();
-    }
-
-    @Override
-    public SequenceInformationExtractor getSequenceInformationExtractor() {
-        return delegate.getSequenceInformationExtractor();
-    }
-
-    @Override
-    public String getSelectGUIDString() {
-        return delegate.getSelectGUIDString();
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return delegate.getLimitHandler();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimit() {
-        return delegate.supportsLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsLimitOffset() {
-        return delegate.supportsLimitOffset();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsVariableLimit() {
-        return delegate.supportsVariableLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersInReverseOrder() {
-        return delegate.bindLimitParametersInReverseOrder();
-    }
-
-    @Override
-    @Deprecated
-    public boolean bindLimitParametersFirst() {
-        return delegate.bindLimitParametersFirst();
-    }
-
-    @Override
-    @Deprecated
-    public boolean useMaxForLimit() {
-        return delegate.useMaxForLimit();
-    }
-
-    @Override
-    @Deprecated
-    public boolean forceLimitUsage() {
-        return delegate.forceLimitUsage();
-    }
-
-    @Override
-    @Deprecated
-    public String getLimitString(String query, int offset, int limit) {
-        return delegate.getLimitString(query, offset, limit);
-    }
-
-    @Override
-    @Deprecated
-    public int convertToFirstRowValue(int zeroBasedFirstResult) {
-        return delegate.convertToFirstRowValue(zeroBasedFirstResult);
-    }
-
-    @Override
-    public boolean supportsLockTimeouts() {
-        return delegate.supportsLockTimeouts();
-    }
-
-    @Override
-    public boolean isLockTimeoutParameterized() {
-        return delegate.isLockTimeoutParameterized();
-    }
-
-    @Override
-    public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-        return delegate.getLockingStrategy(lockable, lockMode);
-    }
-
-    @Override
-    public String getForUpdateString(LockOptions lockOptions) {
-        return delegate.getForUpdateString(lockOptions);
-    }
-
-    @Override
-    public String getForUpdateString(LockMode lockMode) {
-        return delegate.getForUpdateString(lockMode);
-    }
-
-    @Override
-    public String getForUpdateString() {
-        return delegate.getForUpdateString();
-    }
-
-    @Override
-    public String getWriteLockString(int timeout) {
-        return delegate.getWriteLockString(timeout);
-    }
-
-    @Override
-    public String getReadLockString(int timeout) {
-        return delegate.getReadLockString(timeout);
-    }
-
-    @Override
-    public boolean forUpdateOfColumns() {
-        return delegate.forUpdateOfColumns();
-    }
-
-    @Override
-    public boolean supportsOuterJoinForUpdate() {
-        return delegate.supportsOuterJoinForUpdate();
-    }
-
-    @Override
-    public String getForUpdateString(String aliases) {
-        return delegate.getForUpdateString(aliases);
-    }
-
-    @Override
-    public String getForUpdateString(String aliases, LockOptions lockOptions) {
-        return delegate.getForUpdateString(aliases, lockOptions);
-    }
-
-    @Override
-    public String getForUpdateNowaitString() {
-        return delegate.getForUpdateNowaitString();
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString() {
-        return delegate.getForUpdateSkipLockedString();
-    }
-
-    @Override
-    public String getForUpdateNowaitString(String aliases) {
-        return delegate.getForUpdateNowaitString(aliases);
-    }
-
-    @Override
-    public String getForUpdateSkipLockedString(String aliases) {
-        return delegate.getForUpdateSkipLockedString(aliases);
-    }
-
-    @Override
-    @Deprecated
-    public String appendLockHint(LockMode mode, String tableName) {
-        return delegate.appendLockHint(mode, tableName);
-    }
-
-    @Override
-    public String appendLockHint(LockOptions lockOptions, String tableName) {
-        return delegate.appendLockHint(lockOptions, tableName);
-    }
-
-    @Override
-    public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<String, String[]> keyColumnNames) {
-        return delegate.applyLocksToSql(sql, aliasedLockOptions, keyColumnNames);
-    }
-
-    @Override
-    public String getCreateTableString() {
-        return delegate.getCreateTableString();
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return delegate.getCreateMultisetTableString();
-    }
-
-    @Override
-    public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
-        return delegate.getDefaultMultiTableBulkIdStrategy();
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, int position) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, position);
-    }
-
-    @Override
-    public int registerResultSetOutParameter(CallableStatement statement, String name) throws SQLException {
-        return delegate.registerResultSetOutParameter(statement, name);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement) throws SQLException {
-        return delegate.getResultSet(statement);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, int position) throws SQLException {
-        return delegate.getResultSet(statement, position);
-    }
-
-    @Override
-    public ResultSet getResultSet(CallableStatement statement, String name) throws SQLException {
-        return delegate.getResultSet(statement, name);
-    }
-
-    @Override
-    public boolean supportsCurrentTimestampSelection() {
-        return delegate.supportsCurrentTimestampSelection();
-    }
-
-    @Override
-    public boolean isCurrentTimestampSelectStringCallable() {
-        return delegate.isCurrentTimestampSelectStringCallable();
-    }
-
-    @Override
-    public String getCurrentTimestampSelectString() {
-        return delegate.getCurrentTimestampSelectString();
-    }
-
-    @Override
-    public String getCurrentTimestampSQLFunctionName() {
-        return delegate.getCurrentTimestampSQLFunctionName();
-    }
-
-    @Override
-    @Deprecated
-    public SQLExceptionConverter buildSQLExceptionConverter() {
-        return delegate.buildSQLExceptionConverter();
-    }
-
-    @Override
-    public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
-        return delegate.buildSQLExceptionConversionDelegate();
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return delegate.getViolatedConstraintNameExtracter();
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        return delegate.getSelectClauseNullString(sqlType);
-    }
-
-    @Override
-    public boolean supportsUnionAll() {
-        return delegate.supportsUnionAll();
-    }
-
-    @Override
-    public JoinFragment createOuterJoinFragment() {
-        return delegate.createOuterJoinFragment();
-    }
-
-    @Override
-    public CaseFragment createCaseFragment() {
-        return delegate.createCaseFragment();
-    }
-
-    @Override
-    public String getNoColumnsInsertString() {
-        return delegate.getNoColumnsInsertString();
-    }
-
-    @Override
-    public String getLowercaseFunction() {
-        return delegate.getLowercaseFunction();
-    }
-
-    @Override
-    public String getCaseInsensitiveLike() {
-        return delegate.getCaseInsensitiveLike();
-    }
-
-    @Override
-    public boolean supportsCaseInsensitiveLike() {
-        return delegate.supportsCaseInsensitiveLike();
-    }
-
-    @Override
-    public String transformSelectString(String select) {
-        return delegate.transformSelectString(select);
-    }
-
-    @Override
-    public int getMaxAliasLength() {
-        return delegate.getMaxAliasLength();
-    }
-
-    @Override
-    public String toBooleanValueString(boolean bool) {
-        return delegate.toBooleanValueString(bool);
-    }
-
-    @Override
-    @Deprecated
-    public Set<String> getKeywords() {
-        return delegate.getKeywords();
-    }
-
-    @Override
-    public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
-        return delegate.buildIdentifierHelper(builder, dbMetaData);
-    }
-
-    @Override
-    public char openQuote() {
-        return delegate.openQuote();
-    }
-
-    @Override
-    public char closeQuote() {
-        return delegate.closeQuote();
-    }
-
-    @Override
-    public Exporter<Table> getTableExporter() {
-        return delegate.getTableExporter();
-    }
-
-    @Override
-    public Exporter<Sequence> getSequenceExporter() {
-        return delegate.getSequenceExporter();
-    }
-
-    @Override
-    public Exporter<Index> getIndexExporter() {
-        return delegate.getIndexExporter();
-    }
-
-    @Override
-    public Exporter<ForeignKey> getForeignKeyExporter() {
-        return delegate.getForeignKeyExporter();
-    }
-
-    @Override
-    public Exporter<Constraint> getUniqueKeyExporter() {
-        return delegate.getUniqueKeyExporter();
-    }
-
-    @Override
-    public Exporter<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectExporter() {
-        return delegate.getAuxiliaryDatabaseObjectExporter();
-    }
-
-    @Override
-    public boolean canCreateCatalog() {
-        return delegate.canCreateCatalog();
-    }
-
-    @Override
-    public String[] getCreateCatalogCommand(String catalogName) {
-        return delegate.getCreateCatalogCommand(catalogName);
-    }
-
-    @Override
-    public String[] getDropCatalogCommand(String catalogName) {
-        return delegate.getDropCatalogCommand(catalogName);
-    }
-
-    @Override
-    public boolean canCreateSchema() {
-        return delegate.canCreateSchema();
-    }
-
-    @Override
-    public String[] getCreateSchemaCommand(String schemaName) {
-        return delegate.getCreateSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String[] getDropSchemaCommand(String schemaName) {
-        return delegate.getDropSchemaCommand(schemaName);
-    }
-
-    @Override
-    public String getCurrentSchemaCommand() {
-        return delegate.getCurrentSchemaCommand();
-    }
-
-    @Override
-    public SchemaNameResolver getSchemaNameResolver() {
-        return delegate.getSchemaNameResolver();
-    }
-
-    @Override
-    public boolean hasAlterTable() {
-        return delegate.hasAlterTable();
-    }
-
-    @Override
-    public boolean dropConstraints() {
-        return delegate.dropConstraints();
-    }
-
-    @Override
-    public boolean qualifyIndexName() {
-        return delegate.qualifyIndexName();
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return delegate.getAddColumnString();
-    }
-
-    @Override
-    public String getAddColumnSuffixString() {
-        return delegate.getAddColumnSuffixString();
-    }
-
-    @Override
-    public String getDropForeignKeyString() {
-        return delegate.getDropForeignKeyString();
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return delegate.getTableTypeString();
-    }
-
-    @Override
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return delegate.getAddForeignKeyConstraintString(constraintName, foreignKey, referencedTable, primaryKey, referencesPrimaryKey);
-    }
-
-    @Override
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return delegate.getAddPrimaryKeyConstraintString(constraintName);
-    }
-
-    @Override
-    public boolean hasSelfReferentialForeignKeyBug() {
-        return delegate.hasSelfReferentialForeignKeyBug();
-    }
-
-    @Override
-    public String getNullColumnString() {
-        return delegate.getNullColumnString();
-    }
-
-    @Override
-    public boolean supportsCommentOn() {
-        return delegate.supportsCommentOn();
-    }
-
-    @Override
-    public String getTableComment(String comment) {
-        return delegate.getTableComment(comment);
-    }
-
-    @Override
-    public String getColumnComment(String comment) {
-        return delegate.getColumnComment(comment);
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeTableName() {
-        return delegate.supportsIfExistsBeforeTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterTableName() {
-        return delegate.supportsIfExistsAfterTableName();
-    }
-
-    @Override
-    public boolean supportsIfExistsBeforeConstraintName() {
-        return delegate.supportsIfExistsBeforeConstraintName();
-    }
-
-    @Override
-    public boolean supportsIfExistsAfterConstraintName() {
-        return delegate.supportsIfExistsAfterConstraintName();
-    }
-
-    @Override
-    public String getDropTableString(String tableName) {
-        return delegate.getDropTableString(tableName);
-    }
-
-    @Override
-    public boolean supportsColumnCheck() {
-        return delegate.supportsColumnCheck();
-    }
-
-    @Override
-    public boolean supportsTableCheck() {
-        return delegate.supportsTableCheck();
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return delegate.supportsCascadeDelete();
-    }
-
-    @Override
-    public String getCascadeConstraintsString() {
-        return delegate.getCascadeConstraintsString();
-    }
-
-    @Override
-    public String getCrossJoinSeparator() {
-        return delegate.getCrossJoinSeparator();
-    }
-
-    @Override
-    public ColumnAliasExtractor getColumnAliasExtractor() {
-        return delegate.getColumnAliasExtractor();
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return delegate.supportsEmptyInList();
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return delegate.areStringComparisonsCaseInsensitive();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntax() {
-        return delegate.supportsRowValueConstructorSyntax();
-    }
-
-    @Override
-    public boolean supportsRowValueConstructorSyntaxInInList() {
-        return delegate.supportsRowValueConstructorSyntaxInInList();
-    }
-
-    @Override
-    public boolean useInputStreamToInsertBlob() {
-        return delegate.useInputStreamToInsertBlob();
-    }
-
-    @Override
-    public boolean supportsParametersInInsertSelect() {
-        return delegate.supportsParametersInInsertSelect();
-    }
-
-    @Override
-    public boolean replaceResultVariableInOrderByClauseWithPosition() {
-        return delegate.replaceResultVariableInOrderByClauseWithPosition();
-    }
-
-    @Override
-    public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nulls) {
-        return delegate.renderOrderByElement(expression, collation, order, nulls);
-    }
-
-    @Override
-    public boolean requiresCastingOfParametersInSelectClause() {
-        return delegate.requiresCastingOfParametersInSelectClause();
-    }
-
-    @Override
-    public boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() {
-        return delegate.supportsResultSetPositionQueryMethodsOnForwardOnlyCursor();
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return delegate.supportsCircularCascadeDeleteConstraints();
-    }
-
-    @Override
-    public boolean supportsSubselectAsInPredicateLHS() {
-        return delegate.supportsSubselectAsInPredicateLHS();
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return delegate.supportsExpectedLobUsagePattern();
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return delegate.supportsLobValueChangePropogation();
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return delegate.supportsUnboundedLobLocatorMaterialization();
-    }
-
-    @Override
-    public boolean supportsSubqueryOnMutatingTable() {
-        return delegate.supportsSubqueryOnMutatingTable();
-    }
-
-    @Override
-    public boolean supportsExistsInSelect() {
-        return delegate.supportsExistsInSelect();
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return delegate.doesReadCommittedCauseWritersToBlockReaders();
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return delegate.doesRepeatableReadCauseReadersToBlockWriters();
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return delegate.supportsBindAsCallableArgument();
-    }
-
-    @Override
-    public boolean supportsTupleCounts() {
-        return delegate.supportsTupleCounts();
-    }
-
-    @Override
-    public boolean supportsTupleDistinctCounts() {
-        return delegate.supportsTupleDistinctCounts();
-    }
-
-    @Override
-    public boolean requiresParensForTupleDistinctCounts() {
-        return delegate.requiresParensForTupleDistinctCounts();
-    }
-
-    @Override
-    public int getInExpressionCountLimit() {
-        return delegate.getInExpressionCountLimit();
-    }
-
-    @Override
-    public boolean forceLobAsLastValue() {
-        return delegate.forceLobAsLastValue();
-    }
-
-    @Override
-    public boolean useFollowOnLocking() {
-        return delegate.useFollowOnLocking();
-    }
-
-    @Override
-    public String getNotExpression(String expression) {
-        return delegate.getNotExpression(expression);
-    }
-
-    @Override
-    public UniqueDelegate getUniqueDelegate() {
-        return delegate.getUniqueDelegate();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUnique() {
-        return delegate.supportsUnique();
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsUniqueConstraintInCreateAlterTable() {
-        return delegate.supportsUniqueConstraintInCreateAlterTable();
-    }
-
-    @Override
-    @Deprecated
-    public String getAddUniqueConstraintString(String constraintName) {
-        return delegate.getAddUniqueConstraintString(constraintName);
-    }
-
-    @Override
-    @Deprecated
-    public boolean supportsNotNullUnique() {
-        return delegate.supportsNotNullUnique();
-    }
-
-    @Override
-    public String getQueryHintString(String query, List<String> hints) {
-        return delegate.getQueryHintString(query, hints);
-    }
-
-    @Override
-    public ScrollMode defaultScrollMode() {
-        return delegate.defaultScrollMode();
-    }
-
-    @Override
-    public boolean supportsTuplesInSubqueries() {
-        return delegate.supportsTuplesInSubqueries();
-    }
-
-    @Override
-    public CallableStatementSupport getCallableStatementSupport() {
-        return delegate.getCallableStatementSupport();
-    }
-
-    @Override
-    public NameQualifierSupport getNameQualifierSupport() {
-        return delegate.getNameQualifierSupport();
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityManagerFactoryIntegrator.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityManagerFactoryIntegrator.java
deleted file mode 100644
index b766cb1b33..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.HibernateJpa21Provider;
-import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.jpa.HibernateEntityManagerFactory;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class Hibernate5EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
-
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        if (entityManagerFactory == null) {
-            return null;
-        }
-
-        return getDbmsName(entityManagerFactory, null, entityManagerFactory.unwrap(SessionFactoryImplementor.class).getDialect());
-    }
-
-    private String getDbms(EntityManager entityManager) {
-        if (entityManager == null) {
-            return null;
-        }
-        Session s = entityManager.unwrap(Session.class);
-        Dialect dialect = getDialect(s);
-        return getDbmsName(entityManager.getEntityManagerFactory(), entityManager, dialect);
-    }
-
-    private Map<String, CollectionPersister> getCollectionPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getCollectionPersisters();
-    }
-
-    private Map<String, EntityPersister> getEntityPersisters(EntityManager em) {
-        if (em == null) {
-            return null;
-        }
-
-        return em.unwrap(SessionImplementor.class).getFactory().getEntityPersisters();
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                SessionFactoryImplementor factory = null;
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                if (em == null) {
-                    if (entityManagerFactory instanceof SessionFactoryImplementor) {
-                        factory = (SessionFactoryImplementor) entityManagerFactory;
-                    } else if (entityManagerFactory instanceof HibernateEntityManagerFactory) {
-                        factory = (SessionFactoryImplementor) ((HibernateEntityManagerFactory) entityManagerFactory).getSessionFactory();
-                    }
-                    if (factory == null && entityManagerFactory != null) {
-                        factory = entityManagerFactory.unwrap(SessionFactoryImplementor.class);
-                    }
-                    if (factory != null) {
-                        return new HibernateJpa21Provider(persistenceUnitUtil, getDbmsName(entityManagerFactory, em, factory.getDialect()), factory.getEntityPersisters(), factory.getCollectionPersisters(), MAJOR, MINOR, FIX, TYPE);
-                    }
-                }
-                return new HibernateJpa21Provider(persistenceUnitUtil, getDbms(em), getEntityPersisters(em), getCollectionPersisters(em), MAJOR, MINOR, FIX, TYPE);
-            }
-        };
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
deleted file mode 100644
index d1701e4ac1..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5EntityTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.Session;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.resource.transaction.SynchronizationRegistry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.transaction.Synchronization;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5EntityTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-    
-    private final EntityTransaction tx;
-    private final SynchronizationRegistry synchronizationRegistry;
-
-    public Hibernate5EntityTransactionSynchronizationStrategy(EntityManager em) {
-        try {
-            this.tx = em.getTransaction();
-        } catch (IllegalStateException e) {
-            throw new IllegalStateException("Could not access entity transaction!", e);
-        }
-        Session s = em.unwrap(Session.class);
-        this.synchronizationRegistry = ((SessionImplementor) s).getTransactionCoordinator().getLocalSynchronizations();
-    }
-
-    @Override
-    public boolean isActive() {
-        return tx.isActive();
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        tx.setRollbackOnly();
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        synchronizationRegistry.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Integrator.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Integrator.java
deleted file mode 100644
index 53a672da23..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5Integrator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.CTE;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
-import com.blazebit.persistence.integration.hibernate.base.SimpleDatabase;
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.relational.Namespace;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(Integrator.class)
-public class Hibernate5Integrator implements Integrator {
-
-    @Override
-    public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-        List<PersistentClass> invalidPolymorphicCtes = new ArrayList<>();
-        List<String> invalidFormulaCtes = new ArrayList<>();
-        for (PersistentClass clazz : metadata.getEntityBindings()) {
-            Class<?> entityClass = clazz.getMappedClass();
-            
-            if (entityClass != null && entityClass.isAnnotationPresent(CTE.class)) {
-                if (clazz.isPolymorphic()) {
-                    invalidPolymorphicCtes.add(clazz);
-                }
-                Iterator<Property> iterator = clazz.getSubclassPropertyClosureIterator();
-                while (iterator.hasNext()) {
-                    Property property = iterator.next();
-                    if (property.getValue().hasFormula()) {
-                        invalidFormulaCtes.add(clazz.getClassName() + "#" + property.getName());
-                    }
-                }
-                clazz.getTable().setSubselect("select * from " + clazz.getJpaEntityName());
-            }
-        }
-
-        if (!invalidPolymorphicCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found invalid polymorphic CTE entity definitions. CTE entities may not extend other entities:");
-            for (PersistentClass invalidPolymorphicCte : invalidPolymorphicCtes) {
-                sb.append("\n - ").append(invalidPolymorphicCte.getMappedClass().getName());
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-        if (!invalidFormulaCtes.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("Found uses of @Formula in CTE entity definitions. CTE entities can't use @Formula:");
-            for (String invalidFormulaCte : invalidFormulaCtes) {
-                sb.append("\n - ").append(invalidFormulaCte);
-            }
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        TableNameFormatter formatter = new NativeTableNameFormatter(sessionFactory.getJdbcServices().getJdbcEnvironment().getQualifiedObjectNameFormatter());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(getTableIterator(metadata.getDatabase().getNamespaces()), sessionFactory.getDialect(), formatter, metadata));
-    }
-
-    private Iterator<Table> getTableIterator(Iterable<Namespace> namespaces) {
-        List<Iterator<Table>> iterators = new ArrayList<>();
-        Iterator<Namespace> namespaceIterator = namespaces.iterator();
-
-        while (namespaceIterator.hasNext()) {
-            iterators.add(namespaceIterator.next().getTables().iterator());
-        }
-
-        return new MultiIterator<>(iterators);
-    }
-
-    @Override
-    public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
deleted file mode 100644
index 63c4c8bd91..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5JtaPlatformTransactionSynchronizationStrategy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionSupport;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-/**
- * @author Moritz Becker
- * @since 1.4.0
- */
-public class Hibernate5JtaPlatformTransactionSynchronizationStrategy implements TransactionAccess, TransactionSupport {
-
-    private final JtaPlatform jtaPlatform;
-    private final TransactionManager jtaTransactionManager;
-
-    public Hibernate5JtaPlatformTransactionSynchronizationStrategy(JtaPlatform jtaPlatform) {
-        this.jtaPlatform = jtaPlatform;
-        this.jtaTransactionManager = jtaPlatform.retrieveTransactionManager();
-    }
-
-    @Override
-    public boolean isActive() {
-        try {
-            return jtaPlatform.getCurrentStatus() == Status.STATUS_ACTIVE;
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void markRollbackOnly() {
-        try {
-            jtaTransactionManager.setRollbackOnly();
-        } catch (SystemException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void registerSynchronization(Synchronization synchronization) {
-        jtaPlatform.registerSynchronization(synchronization);
-    }
-
-    @Override
-    public void transactional(Runnable runnable) {
-        // In resource local mode, we have no global transaction state
-        runnable.run();
-    }
-
-}
\ No newline at end of file
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandler.java
deleted file mode 100644
index 5a264dd37f..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsLimitHandler;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5LimitHandler implements LimitHandler {
-
-    private final DbmsLimitHandler limitHandler;
-    private Integer limit;
-    private Integer offset;
-
-    public Hibernate5LimitHandler(Dialect dialect, DbmsDialect dbmsDialect) {
-        this.limitHandler = dbmsDialect.createLimitHandler();
-    }
-
-    @Override
-    public boolean supportsLimit() {
-        return limitHandler.supportsLimit();
-    }
-
-    @Override
-    public boolean supportsLimitOffset() {
-        return limitHandler.supportsLimitOffset();
-    }
-
-    @Override
-    public String processSql(String sql, RowSelection selection) {
-        if (selection == null || selection.getMaxRows() == null || selection.getMaxRows().intValue() == Integer.MAX_VALUE) {
-            this.limit = null;
-        } else {
-            this.limit = selection.getMaxRows();
-        }
-        if (selection == null || selection.getFirstRow() == null || selection.getFirstRow().intValue() < 1) {
-            this.offset = null;
-        } else {
-            this.offset = selection.getFirstRow();
-        }
-        return limitHandler.applySql(sql, false, limit, offset);
-    }
-
-    @Override
-    public int bindLimitParametersAtStartOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtStartOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedStatement statement, int index) throws SQLException {
-        return limitHandler.bindLimitParametersAtEndOfQuery(limit, offset, statement, index);
-    }
-
-    @Override
-    public void setMaxRows(RowSelection selection, PreparedStatement statement) throws SQLException {
-        limitHandler.setMaxRows(limit, offset, statement);
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandlingDialect.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandlingDialect.java
deleted file mode 100644
index 5666f04e00..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5LimitHandlingDialect.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.pagination.LimitHandler;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5LimitHandlingDialect extends Hibernate5DelegatingDialect {
-
-    private final DbmsDialect dbmsDialect;
-
-    public Hibernate5LimitHandlingDialect(Dialect delegate, DbmsDialect dbmsDialect) {
-        super(delegate);
-        this.dbmsDialect = dbmsDialect;
-    }
-
-    @Override
-    public LimitHandler getLimitHandler() {
-        return new Hibernate5LimitHandler(this, dbmsDialect);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5MetadataContributor.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5MetadataContributor.java
deleted file mode 100644
index 40d42d64e0..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5MetadataContributor.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import org.hibernate.boot.internal.ClassLoaderAccessImpl;
-import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.boot.spi.MetadataContributor;
-import org.hibernate.cfg.AnnotationBinder;
-import org.hibernate.cfg.InheritanceState;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.service.Service;
-import org.hibernate.service.spi.Configurable;
-import org.hibernate.service.spi.ServiceBinding;
-import org.jboss.jandex.IndexView;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(MetadataContributor.class)
-public class Hibernate5MetadataContributor implements MetadataContributor, Service, Configurable {
-
-    private static final Logger LOG = Logger.getLogger(Hibernate5MetadataContributor.class.getName());
-    private Map<String, Object> configurationValues;
-
-    @Override
-    public void configure(Map configurationValues) {
-        this.configurationValues = configurationValues;
-    }
-
-    @Override
-    public void contribute(InFlightMetadataCollector metadataCollector, IndexView jandexIndex) {
-        ServiceBinding.ServiceLifecycleOwner lifecycleOwner = (ServiceBinding.ServiceLifecycleOwner) metadataCollector.getMetadataBuildingOptions().getServiceRegistry();
-        lifecycleOwner.configureService(new ServiceBinding<>(lifecycleOwner, Hibernate5MetadataContributor.class, this));
-        Object existingStrategy = configurationValues.get("hibernate.hql.bulk_id_strategy");
-        if (existingStrategy == null) {
-            JdbcServices jdbcService = metadataCollector.getMetadataBuildingOptions().getServiceRegistry().getService(JdbcServices.class);
-            MultiTableBulkIdStrategy defaultMultiTableBulkIdStrategy = jdbcService.getDialect().getDefaultMultiTableBulkIdStrategy();
-            configurationValues.put("hibernate.hql.bulk_id_strategy", new CustomMultiTableBulkIdStrategy(defaultMultiTableBulkIdStrategy));
-        } else {
-            LOG.warning("Can't replace hibernate.hql.bulk_id_strategy because it was overridden by the user with: " + existingStrategy);
-        }
-        // Skip if already registered
-        if (metadataCollector.getEntityBinding("com.blazebit.persistence.impl.function.entity.ValuesEntity") != null) {
-            return;
-        }
-
-        MetadataBuildingOptions options = metadataCollector.getMetadataBuildingOptions();
-        final ClassLoaderService classLoaderService = options.getServiceRegistry().getService( ClassLoaderService.class );
-
-        final ClassLoaderAccess classLoaderAccess = new ClassLoaderAccessImpl(
-                options.getTempClassLoader(),
-                classLoaderService
-        );
-
-        MetadataBuildingContext metadataBuildingContext = new MetadataBuildingContextRootImpl(
-                options,
-                classLoaderAccess,
-                metadataCollector);
-
-        addEntity("com.blazebit.persistence.impl.function.entity.ValuesEntity", metadataBuildingContext);
-    }
-
-    private void addEntity(String className, MetadataBuildingContext metadataBuildingContext) {
-        try {
-            MetadataBuildingOptions options = metadataBuildingContext.getBuildingOptions();
-            Object /*ReflectionManager*/ reflectionManager = MetadataBuildingOptions.class.getMethod("getReflectionManager").invoke(options);
-            //            Object /*XClass*/ clazz = reflectionManager.classForName(className);
-            Method classForName = reflectionManager.getClass().getMethod("classForName", String.class);
-            Object /*XClass*/ clazz = classForName.invoke(reflectionManager, className);
-            Map<Object /*XClass*/, InheritanceState> inheritanceStatePerClass = new HashMap<Object /*XClass*/, InheritanceState>(1);
-
-            //        InheritanceState state = new InheritanceState(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            InheritanceState state = InheritanceState.class.getConstructor(classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .newInstance(clazz, inheritanceStatePerClass, metadataBuildingContext);
-
-            inheritanceStatePerClass.put(clazz, state);
-
-            //        AnnotationBinder.bindClass(clazz, inheritanceStatePerClass, metadataBuildingContext);
-            AnnotationBinder.class.getMethod("bindClass", classForName.getReturnType(), Map.class, MetadataBuildingContext.class)
-                    .invoke(null, clazz, inheritanceStatePerClass, metadataBuildingContext);
-        } catch (RuntimeException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not add entity", ex);
-        }
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5ServiceContributor.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5ServiceContributor.java
deleted file mode 100644
index 374886ec65..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5ServiceContributor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.integration.hibernate.base.Database;
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.spi.ServiceContributor;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ServiceContributor.class)
-public class Hibernate5ServiceContributor implements ServiceContributor {
-
-    @Override
-    public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
-        serviceRegistryBuilder.addInitiator(new StandardServiceInitiator<Database>() {
-            @Override
-            public Database initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
-                return null;
-            }
-
-            @Override
-            public Class<Database> getServiceInitiated() {
-                return Database.class;
-            }
-        });
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionFactoryInvocationHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionFactoryInvocationHandler.java
deleted file mode 100644
index 58aee60e6f..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionFactoryInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5SessionFactoryInvocationHandler implements InvocationHandler {
-
-    private final SessionFactoryImplementor delegate;
-    private final Object dialect;
-
-    public Hibernate5SessionFactoryInvocationHandler(SessionFactoryImplementor delegate, Object dialect) {
-        this.delegate = delegate;
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getDialect".equals(method.getName())) {
-            return dialect;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionInvocationHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionInvocationHandler.java
deleted file mode 100644
index c8ed5d1654..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5SessionInvocationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class Hibernate5SessionInvocationHandler implements InvocationHandler {
-    
-    private final SessionImplementor delegate;
-    private final Object jdbcCoordinatorProxy;
-
-    public Hibernate5SessionInvocationHandler(SessionImplementor delegate, Object jdbcCoordinatorProxy) {
-        this.delegate = delegate;
-        this.jdbcCoordinatorProxy = jdbcCoordinatorProxy;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getJdbcCoordinator".equals(method.getName())) {
-            return jdbcCoordinatorProxy;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
deleted file mode 100644
index a9a4592359..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate5TransactionAccessFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.view.spi.TransactionAccess;
-import com.blazebit.persistence.view.spi.TransactionAccessFactory;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.hibernate.service.ServiceRegistry;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ServiceProvider(TransactionAccessFactory.class)
-public class Hibernate5TransactionAccessFactory implements TransactionAccessFactory {
-    @Override
-    public TransactionAccess createTransactionAccess(EntityManager entityManager) {
-        JtaPlatform jtaPlatform = getHibernate5JtaPlatformPresent(entityManager);
-        if (jtaPlatform == null || NoJtaPlatform.class == jtaPlatform.getClass()) {
-            return new Hibernate5EntityTransactionSynchronizationStrategy(entityManager);
-        } else {
-            return new Hibernate5JtaPlatformTransactionSynchronizationStrategy(jtaPlatform);
-        }
-    }
-
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
-    private static JtaPlatform getHibernate5JtaPlatformPresent(EntityManager em) {
-        Session hibernateSession = em.unwrap(Session.class);
-        SessionFactory hibernateSessionFactory = hibernateSession.getSessionFactory();
-        ServiceRegistry hibernateServiceRegistry = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry();
-        return hibernateServiceRegistry.getService(JtaPlatform.class);
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
deleted file mode 100644
index 76c46a02d2..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/JdbcCoordinatorInvocationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class JdbcCoordinatorInvocationHandler implements InvocationHandler {
-
-    private final JdbcCoordinator delegate;
-    private final transient StatementPreparer statementPreparer;
-
-    public JdbcCoordinatorInvocationHandler(JdbcCoordinator delegate, StatementPreparer statementPreparer) {
-        this.delegate = delegate;
-        this.statementPreparer = statementPreparer;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("getStatementPreparer".equals(method.getName())) {
-            return statementPreparer;
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
deleted file mode 100644
index ca9951a57e..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/NativeTableNameFormatter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.TableNameFormatter;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class NativeTableNameFormatter implements TableNameFormatter {
-
-    private final QualifiedObjectNameFormatter formatter;
-
-    public NativeTableNameFormatter(QualifiedObjectNameFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    @Override
-    public String getQualifiedTableName(Dialect dialect, Table table) {
-        return formatter.format(table.getQualifiedTableName(), dialect);
-    }
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
deleted file mode 100644
index 0f2d5f1559..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/PreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.integration.hibernate.base.ResultSetInvocationHandler;
-import com.blazebit.persistence.spi.DbmsDialect;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final DbmsDialect dbmsDialect;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-
-    public PreparedStatementInvocationHandler(PreparedStatement delegate, DbmsDialect dbmsDialect, String[][] columns, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.dbmsDialect = dbmsDialect;
-        this.aliasIndex = new HashMap<String, Integer>(columns.length);
-        this.returningResult = returningResult;
-        
-        for (int i = 0; i < columns.length; i++) {
-            aliasIndex.put(columns[i][1], i + 1);
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if ("executeQuery".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            ResultSet rs;
-            HibernateReturningResult<?> result;
-            
-            if (delegate.execute()) {
-                rs = delegate.getResultSet();
-                result = returningResult;
-            } else {
-                result = null;
-                returningResult.setUpdateCount(delegate.getUpdateCount());
-                rs = dbmsDialect.extractReturningResult(delegate);
-            }
-            
-            return Proxy.newProxyInstance(rs.getClass().getClassLoader(), new Class[]{ ResultSet.class }, new ResultSetInvocationHandler(rs, aliasIndex, result));
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
deleted file mode 100644
index b14fa75d6c..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/SecondaryTableUpdateSupportingPreparedStatementInvocationHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class SecondaryTableUpdateSupportingPreparedStatementInvocationHandler implements InvocationHandler {
-
-    private final SessionImplementor session;
-    private final StatementPreparer statementPreparer;
-    private final PreparedStatement insertStatement;
-    private final String[] updates;
-    private final String[] inserts;
-    private final List<Map.Entry<Method, Object[]>> parameters = new ArrayList<>();
-    private PreparedStatement preparedStatement;
-    private int index;
-    private int insertCount;
-
-    public SecondaryTableUpdateSupportingPreparedStatementInvocationHandler(SessionImplementor session, StatementPreparer statementPreparer, PreparedStatement insertStatement, String[] updates, String[] inserts) {
-        this.session = session;
-        this.statementPreparer = statementPreparer;
-        this.insertStatement = insertStatement;
-        this.updates = updates;
-        this.inserts = inserts;
-    }
-
-    public void prepareNext() {
-        preparedStatement = null;
-        parameters.clear();
-        while (index < updates.length) {
-            String updateSql = updates[index++];
-            if (updateSql != null) {
-                preparedStatement = statementPreparer.prepareStatement(updateSql, false);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        PreparedStatement s;
-        if (preparedStatement == null) {
-            s = insertStatement;
-        } else {
-            s = preparedStatement;
-        }
-        if ("executeUpdate".equals(method.getName()) && method.getParameterTypes().length == 0) {
-            if (preparedStatement == null) {
-                return insertCount = insertStatement.executeUpdate();
-            } else {
-                int updateRows = preparedStatement.executeUpdate();
-                if (updateRows != insertCount) {
-                    // This is where our secondary table insert comes in
-                    PreparedStatement ps = null;
-                    int i = index - 1;
-                    try {
-                        ps = statementPreparer.prepareStatement(inserts[i], false);
-                        for (Map.Entry<Method, Object[]> entry : parameters) {
-                            entry.getKey().invoke(ps, entry.getValue());
-                        }
-                        session.getJdbcCoordinator().getResultSetReturn().executeUpdate(ps);
-                    } finally {
-                        if (ps != null) {
-                            session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release(ps);
-                            session.getJdbcCoordinator().afterStatementExecution();
-                        }
-                    }
-                }
-                return 0;
-            }
-        }
-        if (method.getName().startsWith("set")) {
-            parameters.add(new AbstractMap.SimpleEntry<>(method, args));
-        }
-        return method.invoke(s, args);
-    }
-
-}
diff --git a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java b/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
deleted file mode 100644
index cb80278d05..0000000000
--- a/integration/hibernate-5/src/main/java/com/blazebit/persistence/integration/hibernate/StatementPreparerImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate;
-
-import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.ScrollMode;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
-import org.hibernate.engine.jdbc.spi.StatementPreparer;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
-
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class StatementPreparerImpl implements StatementPreparer {
-
-    private JdbcCoordinator jdbcCoordinator;
-    private SessionFactoryImplementor sessionFactoryImplementor;
-    private DbmsDialect dbmsDialect;
-    private String[][] columns;
-    private int[] returningSqlTypes;
-    private HibernateReturningResult<?> returningResult;
-
-    public StatementPreparerImpl(JdbcCoordinator jdbcCoordinator, SessionFactoryImplementor sessionFactoryImplementor, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        this.jdbcCoordinator = jdbcCoordinator;
-        this.sessionFactoryImplementor = sessionFactoryImplementor;
-        this.dbmsDialect = dbmsDialect;
-        this.columns = columns;
-        this.returningSqlTypes = returningSqlTypes;
-        this.returningResult = returningResult;
-    }
-
-    protected final SessionFactoryOptions settings() {
-        return sessionFactoryImplementor.getSessionFactoryOptions();
-    }
-
-    protected final Connection connection() {
-        return logicalConnection().getPhysicalConnection();
-    }
-
-    protected final LogicalConnectionImplementor logicalConnection() {
-        return jdbcCoordinator.getLogicalConnection();
-    }
-
-    protected final SqlExceptionHelper sqlExceptionHelper() {
-        return getJdbcService().getSqlExceptionHelper();
-    }
-
-    @Override
-    public Statement createStatement() {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    private void checkAutoGeneratedKeysSupportEnabled() {
-        // Not sure if we should respect this
-//        if (!settings().isGetGeneratedKeysEnabled()) {
-//            throw new AssertionFailure("getGeneratedKeys() support is not enabled");
-//        }
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final int autoGeneratedKeys) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, final String[] columnNames) {
-        throw new UnsupportedOperationException("Not yet implemented!");
-    }
-
-    @Override
-    public PreparedStatement prepareQueryStatement(String sql, final boolean isCallable, final ScrollMode scrollMode) {
-        checkAutoGeneratedKeysSupportEnabled();
-        jdbcCoordinator.executeBatch();
-        PreparedStatement ps = new QueryStatementPreparationTemplate(sql) {
-
-            public PreparedStatement doPrepare() throws SQLException {
-                PreparedStatement ps;
-                ps = connection().prepareStatement(sql, dbmsDialect.getPrepareFlags());
-                return dbmsDialect.prepare(ps, returningSqlTypes);
-            }
-        }.prepareStatement();
-        ps = (PreparedStatement) Proxy.newProxyInstance(ps.getClass().getClassLoader(), new Class[]{PreparedStatement.class}, new PreparedStatementInvocationHandler(ps, dbmsDialect, columns, returningResult));
-        jdbcCoordinator.registerLastQuery(ps);
-        return ps;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class StatementPreparationTemplate {
-
-        protected final String sql;
-
-        protected StatementPreparationTemplate(String incomingSql) {
-            final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getStatementInspector().inspect(incomingSql);
-            this.sql = inspectedSql == null ? incomingSql : inspectedSql;
-        }
-
-        public PreparedStatement prepareStatement() {
-            try {
-                getJdbcService().getSqlStatementLogger().logStatement(sql);
-
-                final PreparedStatement preparedStatement;
-                try {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementStart();
-                    preparedStatement = doPrepare();
-                    setStatementTimeout(preparedStatement);
-                } finally {
-                    jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver().jdbcPrepareStatementEnd();
-                }
-                postProcess(preparedStatement);
-                return preparedStatement;
-            } catch (SQLException e) {
-                throw sqlExceptionHelper().convert(e, "could not prepare statement", sql);
-            }
-        }
-
-        protected abstract PreparedStatement doPrepare() throws SQLException;
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            jdbcCoordinator.getResourceRegistry().register(preparedStatement, true);
-            //          logicalConnection().notifyObserversStatementPrepared();
-        }
-
-        private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException {
-            final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod();
-            if (remainingTransactionTimeOutPeriod > 0) {
-                preparedStatement.setQueryTimeout(remainingTransactionTimeOutPeriod);
-            }
-        }
-    }
-
-    private JdbcServices getJdbcService() {
-        return jdbcCoordinator
-                .getJdbcSessionOwner()
-                .getJdbcSessionContext()
-                .getServiceRegistry()
-                .getService(JdbcServices.class);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private abstract class QueryStatementPreparationTemplate extends StatementPreparationTemplate {
-
-        protected QueryStatementPreparationTemplate(String sql) {
-            super(sql);
-        }
-
-        public void postProcess(PreparedStatement preparedStatement) throws SQLException {
-            super.postProcess(preparedStatement);
-            setStatementFetchSize(preparedStatement);
-        }
-    }
-
-    private void setStatementFetchSize(PreparedStatement statement) throws SQLException {
-        if (settings().getJdbcFetchSize() != null) {
-            statement.setFetchSize(settings().getJdbcFetchSize());
-        }
-    }
-
-}
diff --git a/integration/hibernate-6.2/pom.xml b/integration/hibernate-6.2/pom.xml
index 0f554ac297..d4e42e1931 100644
--- a/integration/hibernate-6.2/pom.xml
+++ b/integration/hibernate-6.2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,36 +21,43 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.hibernate</module.name>
-        <main.java.version>1.8</main.java.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
+            <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
+        <!-- Unfortunately, a compile time dependency has to be setup in case. See module-info.java for details -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-            <scope>provided</scope>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
+            <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
@@ -61,81 +68,6 @@
     
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires jakarta.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.persistence.core;
-                                        requires transitive com.blazebit.persistence.integration.hibernate.base;
-                                        requires static com.blazebit.persistence.view;
-                                        provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate60Access;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate60EntityManagerFactoryIntegrator;
-                                        provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate6TransactionAccessFactory;
-                                        provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate60Integrator;
-                                        provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
-                                        provides org.hibernate.boot.spi.MetadataContributor with com.blazebit.persistence.integration.hibernate.Hibernate60MetadataContributor;
-                                        provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate60ServiceContributor;
-                                        exports com.blazebit.persistence.integration.hibernate;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <inherited>true</inherited>
@@ -164,33 +96,21 @@
         <!-- Profiles for various Hibernate 6 versions -->
         <profile>
             <id>hibernate-6.2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <version.hibernate>${version.hibernate-6.2}</version.hibernate>
             </properties>
         </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.3}</version.hibernate>
-            </properties>
-        </profile>
         <profile>
             <id>hibernate-6.4</id>
             <properties>
                 <version.hibernate>${version.hibernate-6.4}</version.hibernate>
             </properties>
         </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.5}</version.hibernate>
-            </properties>
-        </profile>
         <profile>
             <id>hibernate-6.6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
index ba01591700..d4e13cd820 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/CustomPersisterClassResolver.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import org.hibernate.mapping.Collection;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.internal.StandardPersisterClassResolver;
@@ -15,7 +14,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(PersisterClassResolver.class)
 public class CustomPersisterClassResolver extends StandardPersisterClassResolver implements PersisterClassResolver {
 
     @Override
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Access.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Access.java
index 0a067d9371..09fc09efa0 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Access.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Access.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
 import com.blazebit.persistence.integration.hibernate.base.HibernateReturningResult;
 import com.blazebit.persistence.spi.DbmsDialect;
@@ -21,7 +20,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(HibernateAccess.class)
 public class Hibernate62Access implements HibernateAccess {
 
     @Override
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62AdditionalMappingContributor.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62AdditionalMappingContributor.java
index 094ae273f5..8e833ebe02 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62AdditionalMappingContributor.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62AdditionalMappingContributor.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import org.hibernate.boot.ResourceStreamLocator;
 import org.hibernate.boot.spi.AdditionalMappingContributions;
 import org.hibernate.boot.spi.AdditionalMappingContributor;
@@ -16,7 +15,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(AdditionalMappingContributor.class)
 public class Hibernate62AdditionalMappingContributor implements AdditionalMappingContributor {
     @Override
     public void contribute(AdditionalMappingContributions contributions, InFlightMetadataCollector metadata, ResourceStreamLocator resourceStreamLocator, MetadataBuildingContext buildingContext) {
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62EntityManagerFactoryIntegrator.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62EntityManagerFactoryIntegrator.java
index 4bcf4e9e37..7749d9d96c 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62EntityManagerFactoryIntegrator.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62EntityManagerFactoryIntegrator.java
@@ -5,10 +5,8 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.integration.hibernate.base.HibernateJpaProvider;
 import com.blazebit.persistence.integration.hibernate.base.function.AbstractHibernateEntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
 import com.blazebit.persistence.spi.JpaProvider;
 import com.blazebit.persistence.spi.JpaProviderFactory;
 import jakarta.persistence.EntityManager;
@@ -24,7 +22,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
 public class Hibernate62EntityManagerFactoryIntegrator extends AbstractHibernateEntityManagerFactoryIntegrator {
 
     @Override
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Integrator.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Integrator.java
index afba128ee9..28f2a13fd8 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Integrator.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62Integrator.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.CTE;
 import com.blazebit.persistence.integration.hibernate.base.Database;
 import com.blazebit.persistence.integration.hibernate.base.MultiIterator;
@@ -29,7 +28,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(Integrator.class)
 public class Hibernate62Integrator implements Integrator {
 
     @Override
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62ServiceContributor.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62ServiceContributor.java
index f240213836..47b98a6f9a 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62ServiceContributor.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate62ServiceContributor.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.integration.hibernate.base.Database;
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
@@ -18,7 +17,6 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(ServiceContributor.class)
 public class Hibernate62ServiceContributor implements ServiceContributor {
 
     @Override
diff --git a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate6TransactionAccessFactory.java b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate6TransactionAccessFactory.java
index 1d6fdd6d10..704a7ef1c0 100644
--- a/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate6TransactionAccessFactory.java
+++ b/integration/hibernate-6.2/src/main/java/com/blazebit/persistence/integration/hibernate/Hibernate6TransactionAccessFactory.java
@@ -4,7 +4,6 @@
  */
 package com.blazebit.persistence.integration.hibernate;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.view.spi.TransactionAccess;
 import com.blazebit.persistence.view.spi.TransactionAccessFactory;
 import org.hibernate.Session;
@@ -19,7 +18,6 @@
  * @author Moritz Becker
  * @since 1.6.7
  */
-@ServiceProvider(TransactionAccessFactory.class)
 public class Hibernate6TransactionAccessFactory implements TransactionAccessFactory {
     @Override
     public TransactionAccess createTransactionAccess(EntityManager entityManager) {
diff --git a/integration/hibernate-6.2/src/main/java/module-info.java b/integration/hibernate-6.2/src/main/java/module-info.java
new file mode 100644
index 0000000000..6932606f10
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.hibernate {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires org.hibernate.orm.core;
+	requires com.blazebit.persistence.core;
+	requires transitive com.blazebit.persistence.integration.hibernate.base;
+	// Can't make this static even though this would be very desirable, due to https://bugs.openjdk.org/browse/JDK-8299504
+	// The only "dependency" on this module is to provide a service, but JPMS can't model this correctly
+	requires com.blazebit.persistence.view;
+	requires jakarta.transaction;
+	provides com.blazebit.persistence.integration.hibernate.base.HibernateAccess with com.blazebit.persistence.integration.hibernate.Hibernate62Access;
+	provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.hibernate.Hibernate62EntityManagerFactoryIntegrator;
+	provides com.blazebit.persistence.view.spi.TransactionAccessFactory with com.blazebit.persistence.integration.hibernate.Hibernate6TransactionAccessFactory;
+	provides org.hibernate.integrator.spi.Integrator with com.blazebit.persistence.integration.hibernate.Hibernate62Integrator;
+	provides org.hibernate.persister.spi.PersisterClassResolver with com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver;
+	provides org.hibernate.boot.spi.AdditionalMappingContributor with com.blazebit.persistence.integration.hibernate.Hibernate62AdditionalMappingContributor;
+	provides org.hibernate.service.spi.ServiceContributor with com.blazebit.persistence.integration.hibernate.Hibernate62ServiceContributor;
+	exports com.blazebit.persistence.integration.hibernate;
+}
\ No newline at end of file
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.integration.hibernate.base.HibernateAccess b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.integration.hibernate.base.HibernateAccess
new file mode 100644
index 0000000000..91e0a30cd6
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.integration.hibernate.base.HibernateAccess
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate62Access
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator
new file mode 100644
index 0000000000..8ee0bb70bf
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.spi.EntityManagerFactoryIntegrator
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate62EntityManagerFactoryIntegrator
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory
new file mode 100644
index 0000000000..f58b146cd7
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/com.blazebit.persistence.view.spi.TransactionAccessFactory
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate6TransactionAccessFactory
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.boot.spi.AdditionalMappingContributor b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.boot.spi.AdditionalMappingContributor
new file mode 100644
index 0000000000..1d403650ad
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.boot.spi.AdditionalMappingContributor
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate62AdditionalMappingContributor
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator
new file mode 100644
index 0000000000..44679fc162
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate62Integrator
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.persister.spi.PersisterClassResolver b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.persister.spi.PersisterClassResolver
new file mode 100644
index 0000000000..9cf79660e9
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.persister.spi.PersisterClassResolver
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.CustomPersisterClassResolver
diff --git a/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.service.spi.ServiceContributor b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.service.spi.ServiceContributor
new file mode 100644
index 0000000000..452f74a55a
--- /dev/null
+++ b/integration/hibernate-6.2/src/main/resources/META-INF/services/org.hibernate.service.spi.ServiceContributor
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.Hibernate62ServiceContributor
diff --git a/integration/hibernate-base-jakarta/pom.xml b/integration/hibernate-base-jakarta/pom.xml
deleted file mode 100644
index 0558e2eb62..0000000000
--- a/integration/hibernate-base-jakarta/pom.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-base-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate.base</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${version.javassist}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-hibernate-base:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-base:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-hibernate-base:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/hibernate-base/.gitignore b/integration/hibernate-base/.gitignore
deleted file mode 100644
index 1dd3331081..0000000000
--- a/integration/hibernate-base/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/target/
diff --git a/integration/hibernate-base/pom.xml b/integration/hibernate-base/pom.xml
deleted file mode 100644
index 626d16fb59..0000000000
--- a/integration/hibernate-base/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration Hibernate Base</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.hibernate.base</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${version.javassist}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <!-- Minimum version is 4.2.8.Final -->
-            <!-- 4.2.15.Final has a bug regarding naming strategies -->
-            <version>4.2.14.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.integration.jpa;
-                                        exports com.blazebit.persistence.integration.hibernate.base;
-                                        exports com.blazebit.persistence.integration.hibernate.base.spi;
-                                        exports com.blazebit.persistence.integration.hibernate.base.function;
-                                        uses com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-                                        uses com.blazebit.persistence.integration.hibernate.base.spi.HibernateVersionProvider;
-                                        provides com.blazebit.persistence.spi.ExtendedQuerySupport with com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/CustomCollectionPersister.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/CustomCollectionPersister.java
deleted file mode 100644
index 755753c2b4..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/CustomCollectionPersister.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface CustomCollectionPersister {
-
-    public String getMappedByProperty();
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/Database.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/Database.java
deleted file mode 100644
index eab1075162..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/Database.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.mapping.Table;
-import org.hibernate.service.Service;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface Database extends Service {
-
-    public Table getTable(String name);
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java
deleted file mode 100644
index e6437bb18d..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateAccess.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import com.blazebit.persistence.spi.DbmsDialect;
-import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
-import org.hibernate.Query;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface HibernateAccess {
-
-    public List<Object[]> list(QueryLoader queryLoader, SessionImplementor sessionImplementor, QueryParameters queryParameters);
-
-    public List<Object> performList(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters);
-
-    public Object performStream(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters);
-
-    public int performExecuteUpdate(HQLQueryPlan queryPlan, SessionImplementor sessionImplementor, QueryParameters queryParameters);
-
-    public void doExecute(StatementExecutor executor, String delete, QueryParameters parameters, SessionImplementor session, List<ParameterSpecification> parameterSpecifications);
-
-    public QueryParameters getQueryParameters(Query hibernateQuery, Map<String, TypedValue> namedParams);
-
-    public Map<String, TypedValue> getNamedParams(Query hibernateQuery);
-
-    public String expandParameterLists(SessionImplementor session, Query hibernateQuery, Map<String, TypedValue> namedParamsCopy);
-
-    public SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult);
-
-    public SessionFactoryImplementor wrapSessionFactory(SessionFactoryImplementor sessionFactory, DbmsDialect dbmsDialect);
-    
-    public void checkTransactionSynchStatus(SessionImplementor session);
-    
-    public void afterTransaction(SessionImplementor session, boolean success);
-
-    public RuntimeException convert(EntityManager em, HibernateException e);
-
-    public void handlePersistenceException(EntityManager em, PersistenceException e);
-
-    public void throwPersistenceException(EntityManager em, HibernateException e);
-
-    public QueryParameters createQueryParameters(
-            final Type[] positionalParameterTypes,
-            final Object[] positionalParameterValues,
-            final Map<String,TypedValue> namedParameters,
-            final LockOptions lockOptions,
-            final RowSelection rowSelection,
-            final boolean isReadOnlyInitialized,
-            final boolean readOnly,
-            final boolean cacheable,
-            final String cacheRegion,
-            //final boolean forceCacheRefresh,
-            final String comment,
-            final List<String> queryHints,
-            final Serializable[] collectionKeys);
-
-    public ParameterTranslations createParameterTranslations(List<ParameterSpecification> queryParameterSpecifications);
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
deleted file mode 100644
index 086fa7171e..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
+++ /dev/null
@@ -1,1412 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import antlr.collections.AST;
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.ConfigurationProperties;
-import com.blazebit.persistence.ReturningResult;
-import com.blazebit.persistence.spi.ConfigurationSource;
-import com.blazebit.persistence.spi.CteQueryWrapper;
-import com.blazebit.persistence.spi.DbmsDialect;
-import com.blazebit.persistence.spi.DbmsStatementType;
-import com.blazebit.persistence.spi.ExtendedQuerySupport;
-import com.blazebit.reflection.ReflectionUtils;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.TypeMismatchException;
-import org.hibernate.engine.query.spi.HQLQueryPlan;
-import org.hibernate.engine.query.spi.QueryPlanCache;
-import org.hibernate.engine.spi.QueryParameters;
-import org.hibernate.engine.spi.RowSelection;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.TypedValue;
-import org.hibernate.event.service.spi.EventListenerRegistry;
-import org.hibernate.event.spi.AutoFlushEvent;
-import org.hibernate.event.spi.AutoFlushEventListener;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.event.spi.EventType;
-import org.hibernate.hql.internal.QueryExecutionRequestException;
-import org.hibernate.hql.internal.antlr.SqlTokenTypes;
-import org.hibernate.hql.internal.ast.exec.BasicExecutor;
-import org.hibernate.hql.internal.ast.exec.DeleteExecutor;
-import org.hibernate.hql.internal.ast.exec.StatementExecutor;
-import org.hibernate.hql.internal.ast.tree.AbstractStatement;
-import org.hibernate.hql.internal.ast.tree.DotNode;
-import org.hibernate.hql.internal.ast.tree.FromElement;
-import org.hibernate.hql.internal.ast.tree.InsertStatement;
-import org.hibernate.hql.internal.ast.tree.QueryNode;
-import org.hibernate.hql.internal.ast.tree.SelectClause;
-import org.hibernate.hql.spi.ParameterTranslations;
-import org.hibernate.hql.spi.QueryTranslator;
-import org.hibernate.internal.util.collections.BoundedConcurrentHashMap;
-import org.hibernate.loader.hql.QueryLoader;
-import org.hibernate.param.ParameterSpecification;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.type.ManyToOneType;
-import org.hibernate.type.Type;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Logger;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(ExtendedQuerySupport.class)
-public class HibernateExtendedQuerySupport implements ExtendedQuerySupport {
-
-    private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
-    private static final String[] KNOWN_STATEMENTS = { "select ", "insert ", "update ", "delete " };
-    
-    private final ConcurrentMap<SessionFactoryImplementor, BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue>> queryPlanCachesCache = new ConcurrentHashMap<>();
-    private final ConcurrentMap<FieldKey, Field> fieldCache = new ConcurrentHashMap<>();
-    private final HibernateAccess hibernateAccess;
-    
-    public HibernateExtendedQuerySupport() {
-        Iterator<HibernateAccess> serviceIter = ServiceLoader.load(HibernateAccess.class).iterator();
-        if (!serviceIter.hasNext()) {
-            throw new IllegalStateException("Hibernate integration was not found on the class path!");
-        }
-        this.hibernateAccess = serviceIter.next();
-    }
-
-    @Override
-    public boolean supportsAdvancedSql() {
-        return true;
-    }
-
-    @Override
-    public boolean needsExampleQueryForAdvancedDml() {
-        return false;
-    }
-
-    @Override
-    public boolean applyFirstResultMaxResults(Query query, int firstResult, int maxResults) {
-//        boolean changed = firstResult == 0 && query.getFirstResult() != 0 || firstResult != 0 && query.getFirstResult() == 0
-//                || maxResults == Integer.MAX_VALUE && query.getMaxResults() != Integer.MAX_VALUE || maxResults != Integer.MAX_VALUE && query.getMaxResults() == Integer.MAX_VALUE;
-        query.setFirstResult(firstResult);
-        query.setMaxResults(maxResults);
-        // Since getSqlContainsLimit returns false, we don't consider any limit/offset change as "dirty"
-        return false;
-    }
-
-    @Override
-    public String getSql(EntityManager em, Query query) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        HQLQueryPlan queryPlan = getOriginalQueryPlan(session, query);
-
-        if (queryPlan.getTranslators().length > 1) {
-            throw new IllegalArgumentException("No support for multiple translators yet!");
-        }
-        QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-
-        String[] sqls;
-        if (queryTranslator.isManipulationStatement()) {
-            StatementExecutor executor = getStatementExecutor(queryTranslator);
-            if (!(executor instanceof BasicExecutor)) {
-                throw new IllegalArgumentException("Using polymorphic deletes/updates with CTEs is not yet supported");
-            }
-            sqls = executor.getSqlStatements();
-        } else {
-            sqls = queryPlan.getSqlStrings();
-        }
-        // TODO: have to handle multiple sql strings which happens when having e.g. a polymorphic UPDATE/DELETE
-        for (int i = 0; i < sqls.length; i++) {
-            if (sqls[i] != null) {
-                return sqls[i];
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean getSqlContainsLimit() {
-        return false;
-    }
-
-    @Override
-    public List<String> getCascadingDeleteSql(EntityManager em, Query query) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        HQLQueryPlan queryPlan = getOriginalQueryPlan(session, query);
-        if (queryPlan.getTranslators().length > 1) {
-            throw new IllegalArgumentException("No support for multiple translators yet!");
-        }
-        // TODO: check if this is actually a delete statement
-        QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-        StatementExecutor executor = getStatementExecutor(queryTranslator);
-        if (executor == null || !(executor instanceof DeleteExecutor)) {
-            return Collections.EMPTY_LIST;
-        }
-
-        List<String> deletes = getField(executor, "deletes");
-        if (deletes == null) {
-            return Collections.EMPTY_LIST;
-        }
-        return deletes;
-    }
-    
-    private HQLQueryPlan getOriginalQueryPlan(SessionImplementor session, Query query) {
-        SessionFactoryImplementor sfi = session.getFactory();
-        org.hibernate.Query hibernateQuery = query.unwrap(org.hibernate.Query.class);
-        
-        Map<String, TypedValue> namedParams = new HashMap<String, TypedValue>(hibernateAccess.getNamedParams(hibernateQuery));
-        String queryString = hibernateAccess.expandParameterLists(session, hibernateQuery, namedParams);
-        return sfi.getQueryPlanCache().getHQLQueryPlan(queryString, false, Collections.EMPTY_MAP);
-    }
-
-    @Override
-    public String getSqlAlias(EntityManager em, Query query, String alias, int queryPartNumber) {
-        FromElement fromElement = getSqlFromElement(em, query, alias, queryPartNumber);
-
-        if (fromElement == null) {
-            throw new IllegalArgumentException("The alias " + alias + " could not be found in the query: " + query);
-        }
-
-        return fromElement.getTableAlias();
-    }
-
-    private FromElement getSqlFromElement(EntityManager em, Query query, String alias, int queryPartNumber) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        HQLQueryPlan plan = getOriginalQueryPlan(session, query);
-        if (plan.getTranslators().length > 1) {
-            throw new IllegalArgumentException("No support for multiple translators yet!");
-        }
-        QueryTranslator translator = plan.getTranslators()[0];
-        
-        AbstractStatement statement = getField(translator, "sqlAst");
-        QueryNode queryNode;
-
-        if (statement instanceof QueryNode) {
-            queryNode = (QueryNode) statement;
-        } else if (statement instanceof InsertStatement) {
-            queryNode = (QueryNode) ((InsertStatement) statement).getIntoClause().getNextSibling();
-        } else {
-            queryNode = (QueryNode) statement.getNextSibling();
-        }
-        return queryNode.getFromClause().getFromElement(alias);
-    }
-
-    @Override
-    public SqlFromInfo getSqlFromInfo(EntityManager em, Query query, String alias, int queryPartNumber) {
-        FromElement fromElement = getSqlFromElement(em, query, alias, queryPartNumber);
-
-        if (fromElement == null) {
-            throw new IllegalArgumentException("The alias " + alias + " could not be found in the query: " + query);
-        }
-        String sql = getSql(em, query);
-        final String text = fromElement.getText();
-        final String tableAlias = fromElement.getTableAlias();
-        final int startIndex = sql.indexOf(text);
-        return new SqlFromInfo() {
-            @Override
-            public String getAlias() {
-                return tableAlias;
-            }
-
-            @Override
-            public int getFromStartIndex() {
-                return startIndex;
-            }
-
-            @Override
-            public int getFromEndIndex() {
-                return startIndex + text.length();
-            }
-        };
-    }
-
-    @Override
-    public int getSqlSelectAliasPosition(EntityManager em, Query query, String alias) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        HQLQueryPlan plan = getOriginalQueryPlan(session, query);
-        if (plan.getTranslators().length > 1) {
-            throw new IllegalArgumentException("No support for multiple translators yet!");
-        }
-        QueryTranslator translator = plan.getTranslators()[0];
-
-        try {
-            QueryNode queryNode = getField(translator, "sqlAst");
-            
-            String[] aliases = queryNode.getSelectClause().getQueryReturnAliases();
-
-            for (int i = 0; i < aliases.length; i++) {
-                if (alias.equals(aliases[i])) {
-                    // the ordinal is 1 based
-                    return i + 1;
-                }
-            }
-            
-            return -1;
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-    
-    @Override
-    public int getSqlSelectAttributePosition(EntityManager em, Query query, String expression) {
-        if (expression.contains(".")) {
-            // TODO: implement
-            throw new UnsupportedOperationException("Embeddables are not yet supported!");
-        }
-        
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        HQLQueryPlan plan = getOriginalQueryPlan(session, query);
-        if (plan.getTranslators().length > 1) {
-            throw new IllegalArgumentException("No support for multiple translators yet!");
-        }
-        QueryTranslator translator = plan.getTranslators()[0];
-
-        try {
-            QueryNode queryNode = getField(translator, "sqlAst");
-            SelectClause selectClause = queryNode.getSelectClause();
-            Type[] queryReturnTypes = selectClause.getQueryReturnTypes();
-            
-            boolean found = false;
-            // The ordinal is 1 based
-            int position = 1;
-            for (int i = 0; i < queryReturnTypes.length; i++) {
-                Type t = queryReturnTypes[i];
-                if (t instanceof ManyToOneType) {
-                    ManyToOneType manyToOneType = (ManyToOneType) t;
-                    AbstractEntityPersister persister = (AbstractEntityPersister) session.getFactory().getEntityPersister(manyToOneType.getAssociatedEntityName());
-                    
-                    int propertyIndex = persister.getPropertyIndex(expression);
-                    found = true;
-                    for (int j = 0; j < propertyIndex; j++) {
-                        position += persister.getPropertyColumnNames(j).length;
-                    }
-                    // Increment to the actual property position
-                    position++;
-                } else {
-                    position++;
-                }
-            }
-            
-            if (found) {
-                return position;
-            }
-
-            AST selectItem = selectClause.getFirstChild();
-
-            while (selectItem != null && (selectItem.getType() == SqlTokenTypes.DISTINCT || selectItem.getType() == SqlTokenTypes.ALL)) {
-                selectItem = selectItem.getNextSibling();
-            }
-
-            position = 1;
-            for (AST n = selectItem; n != null; n = n.getNextSibling()) {
-                if (n instanceof DotNode) {
-                    DotNode dot = (DotNode) n;
-                    if (expression.equals(dot.getPropertyPath())) {
-                        // Check if the property is an embeddable
-                        if (dot.getText().contains(",")) {
-                            throw new IllegalStateException("Can't order by the embeddable: " + expression);
-                        }
-                        found = true;
-                        break;
-                    }
-                }
-                position++;
-            }
-
-            if (found) {
-                return position;
-            }
-            
-            return -1;
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        EntityManager em = serviceProvider.getService(EntityManager.class);
-        try {
-            return list(serviceProvider, em, participatingQueries, query, sqlOverride, queryPlanCacheEnabled);
-        } catch (QueryExecutionRequestException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalStateException(he);
-        } catch (TypeMismatchException e) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalArgumentException(e);
-        } catch (HibernateException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw hibernateAccess.convert(em, he);
-        }
-    }
-
-    @Override
-    public Object getResultStream(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        EntityManager em = serviceProvider.getService(EntityManager.class);
-        try {
-            return stream(serviceProvider, em, participatingQueries, query, sqlOverride, queryPlanCacheEnabled);
-        } catch (QueryExecutionRequestException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalStateException(he);
-        } catch (TypeMismatchException e) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalArgumentException(e);
-        } catch (HibernateException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw hibernateAccess.convert(em, he);
-        }
-    }
-
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public Object getSingleResult(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query query, String sqlOverride, boolean queryPlanCacheEnabled) {
-        EntityManager em = serviceProvider.getService(EntityManager.class);
-        try {
-            final List result = list(serviceProvider, em, participatingQueries, query, sqlOverride, queryPlanCacheEnabled);
-
-            if (result.size() == 0) {
-                NoResultException nre = new NoResultException("No entity found for query");
-                hibernateAccess.handlePersistenceException(em, nre);
-                throw nre;
-            } else if (result.size() > 1) {
-                final Set uniqueResult = new HashSet(result);
-                if (uniqueResult.size() > 1) {
-                    NonUniqueResultException nure = new NonUniqueResultException("result returns more than one element");
-                    hibernateAccess.handlePersistenceException(em, nure);
-                    throw nure;
-                } else {
-                    return uniqueResult.iterator().next();
-                }
-            } else {
-                return result.get(0);
-            }
-        } catch (QueryExecutionRequestException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalStateException(he);
-        } catch (TypeMismatchException e) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw new IllegalArgumentException(e);
-        } catch (HibernateException he) {
-            LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-            throw hibernateAccess.convert(em, he);
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    private List list(com.blazebit.persistence.spi.ServiceProvider serviceProvider, EntityManager em, List<Query> participatingQueries, Query query, String finalSql, boolean queryPlanCacheEnabled) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        SessionFactoryImplementor sfi = session.getFactory();
-
-        if (session.isClosed()) {
-            throw new PersistenceException("Entity manager is closed!");
-        }
-
-        // Create combined query parameters
-        List<String> queryStrings = new ArrayList<>(participatingQueries.size());
-        Set<String> querySpaces = new HashSet<>();
-        QueryParamEntry queryParametersEntry = createQueryParameters(em, query, participatingQueries, queryStrings, querySpaces);
-        QueryParameters queryParameters = queryParametersEntry.queryParameters;
-
-        QueryPlanCacheKey cacheKey = queryPlanCacheEnabled ? createCacheKey(finalSql, participatingQueries, queryStrings) : null;
-        CacheEntry<QueryPlanCacheValue> queryPlanEntry = getQueryPlan(sfi, query, cacheKey);
-        QueryPlanCacheValue queryPlanCacheValue = queryPlanEntry.getValue();
-        HQLQueryPlan queryPlan = queryPlanCacheValue.getQueryPlan();
-        
-        if (!queryPlanEntry.isFromCache()) {
-            prepareQueryPlan(queryPlan, queryParametersEntry.specifications, finalSql, session, null, false, serviceProvider.getService(DbmsDialect.class));
-            if (queryPlanCacheEnabled) {
-                putQueryPlanIfAbsent(sfi, cacheKey, queryPlanCacheValue);
-            }
-        }
-
-        autoFlush(querySpaces, session);
-        return hibernateAccess.performList(queryPlan, session, queryParameters);
-    }
-
-    @SuppressWarnings("rawtypes")
-    private Object stream(com.blazebit.persistence.spi.ServiceProvider serviceProvider, EntityManager em, List<Query> participatingQueries, Query query, String finalSql, boolean queryPlanCacheEnabled) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        SessionFactoryImplementor sfi = session.getFactory();
-
-        if (session.isClosed()) {
-            throw new PersistenceException("Entity manager is closed!");
-        }
-
-        // Create combined query parameters
-        List<String> queryStrings = new ArrayList<>(participatingQueries.size());
-        Set<String> querySpaces = new HashSet<>();
-        QueryParamEntry queryParametersEntry = createQueryParameters(em, query, participatingQueries, queryStrings, querySpaces);
-        QueryParameters queryParameters = queryParametersEntry.queryParameters;
-
-        QueryPlanCacheKey cacheKey = queryPlanCacheEnabled ? createCacheKey(finalSql, participatingQueries, queryStrings) : null;
-        CacheEntry<QueryPlanCacheValue> queryPlanEntry = getQueryPlan(sfi, query, cacheKey);
-        QueryPlanCacheValue queryPlanCacheValue = queryPlanEntry.getValue();
-        HQLQueryPlan queryPlan = queryPlanCacheValue.getQueryPlan();
-
-        if (!queryPlanEntry.isFromCache()) {
-            prepareQueryPlan(queryPlan, queryParametersEntry.specifications, finalSql, session, null, false, serviceProvider.getService(DbmsDialect.class));
-            if (queryPlanCacheEnabled) {
-                putQueryPlanIfAbsent(sfi, cacheKey, queryPlanCacheValue);
-            }
-        }
-
-        autoFlush(querySpaces, session);
-        return hibernateAccess.performStream(queryPlan, session, queryParameters);
-    }
-
-    @Override
-    public int executeUpdate(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query baseQuery, Query query, String finalSql, boolean queryPlanCacheEnabled) {
-        DbmsDialect dbmsDialect = serviceProvider.getService(DbmsDialect.class);
-        EntityManager em = serviceProvider.getService(EntityManager.class);
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        SessionFactoryImplementor sfi = session.getFactory();
-
-        if (session.isClosed()) {
-            throw new PersistenceException("Entity manager is closed!");
-        }
-
-        Integer firstResult = null;
-        Integer maxResults = null;
-
-        if (query.getFirstResult() > 0) {
-            firstResult = query.getFirstResult();
-        }
-        if (query.getMaxResults() != Integer.MAX_VALUE) {
-            maxResults = query.getMaxResults();
-        }
-
-        // Create combined query parameters
-        List<String> queryStrings = new ArrayList<>(participatingQueries.size());
-        Set<String> querySpaces = new HashSet<>();
-        QueryParamEntry queryParametersEntry = createQueryParameters(em, baseQuery, participatingQueries, queryStrings, querySpaces);
-        QueryParameters queryParameters = queryParametersEntry.queryParameters;
-
-        QueryPlanCacheKey cacheKey = queryPlanCacheEnabled ? createCacheKey(finalSql, participatingQueries, queryStrings, firstResult, maxResults) : null;
-        CacheEntry<QueryPlanCacheValue> queryPlanEntry = getQueryPlan(sfi, query, cacheKey);
-        QueryPlanCacheValue queryPlanCacheValue = queryPlanEntry.getValue();
-        HQLQueryPlan queryPlan = queryPlanCacheValue.getQueryPlan();
-
-        String[][] returningColumns;
-        int[] returningColumnTypes;
-        if (queryPlan.getReturnMetadata() == null) {
-            returningColumns = null;
-            returningColumnTypes = null;
-        } else {
-            if (queryPlanEntry.isFromCache()) {
-                returningColumns = queryPlanCacheValue.getReturningColumns();
-                returningColumnTypes = queryPlanCacheValue.getReturningColumnTypes();
-            } else {
-                String exampleQuerySql = queryPlanCacheValue.getQueryPlan().getSqlStrings()[0];
-                boolean caseInsensitive = !Boolean.valueOf(serviceProvider.getService(ConfigurationSource.class).getProperty(ConfigurationProperties.RETURNING_CLAUSE_CASE_SENSITIVE));
-                returningColumns = getReturningColumns(caseInsensitive, exampleQuerySql);
-                returningColumnTypes = dbmsDialect.needsReturningSqlTypes() ? getReturningColumnTypes(queryPlan, sfi) : null;
-            }
-        }
-
-        if (!queryPlanEntry.isFromCache()) {
-            prepareQueryPlan(queryPlan, queryParametersEntry.specifications, finalSql, session, baseQuery, true, dbmsDialect);
-            if (queryPlanCacheEnabled) {
-                putQueryPlanIfAbsent(sfi, cacheKey, new QueryPlanCacheValue(queryPlan, returningColumns, returningColumnTypes));
-            }
-        }
-
-        autoFlush(querySpaces, session);
-
-        if (queryPlan.getReturnMetadata() == null) {
-            return hibernateAccess.performExecuteUpdate(queryPlan, session, queryParameters);
-        }
-
-        try {
-            @SuppressWarnings("unchecked")
-            List<Object> results = hibernateAccess.performList(queryPlan, wrapSession(session, dbmsDialect, returningColumns, returningColumnTypes, null), queryParameters);
-            
-            if (results.size() != 1) {
-                throw new IllegalArgumentException("Expected size 1 but was: " + results.size());
-            }
-            
-            Number count = (Number) results.get(0);
-            return count.intValue();
-        } catch (QueryExecutionRequestException he) {
-            LOG.severe("Could not execute the following SQL query: " + finalSql);
-            throw new IllegalStateException(he);
-        } catch (TypeMismatchException e) {
-            LOG.severe("Could not execute the following SQL query: " + finalSql);
-            throw new IllegalArgumentException(e);
-        } catch (HibernateException he) {
-            LOG.severe("Could not execute the following SQL query: " + finalSql);
-            hibernateAccess.throwPersistenceException(em, he);
-            return 0;
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public ReturningResult<Object[]> executeReturning(com.blazebit.persistence.spi.ServiceProvider serviceProvider, List<Query> participatingQueries, Query modificationBaseQuery, Query exampleQuery, String sqlOverride, boolean queryPlanCacheEnabled) {
-        DbmsDialect dbmsDialect = serviceProvider.getService(DbmsDialect.class);
-        EntityManager em = serviceProvider.getService(EntityManager.class);
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        SessionFactoryImplementor sfi = session.getFactory();
-
-        if (session.isClosed()) {
-            throw new PersistenceException("Entity manager is closed!");
-        }
-
-        // Create combined query parameters
-        List<String> queryStrings = new ArrayList<>(participatingQueries.size());
-        Set<String> querySpaces = new HashSet<>();
-        QueryParamEntry queryParametersEntry = createQueryParameters(em, modificationBaseQuery, participatingQueries, queryStrings, querySpaces);
-        QueryParameters queryParameters = queryParametersEntry.queryParameters;
-        
-        // Create plan for example query
-        QueryPlanCacheKey cacheKey = queryPlanCacheEnabled ? createCacheKey(sqlOverride, participatingQueries, queryStrings) : null;
-        CacheEntry<QueryPlanCacheValue> queryPlanEntry = getQueryPlan(sfi, exampleQuery, cacheKey);
-        QueryPlanCacheValue queryPlanCacheValue = queryPlanEntry.getValue();
-        HQLQueryPlan queryPlan = queryPlanCacheValue.getQueryPlan();
-
-        String[][] returningColumns;
-        int[] returningColumnTypes;
-        if (queryPlanEntry.isFromCache()) {
-            returningColumns = queryPlanCacheValue.getReturningColumns();
-            returningColumnTypes = queryPlanCacheValue.getReturningColumnTypes();
-        } else {
-            String exampleQuerySql = queryPlan.getSqlStrings()[0];
-            boolean caseInsensitive = !Boolean.valueOf(serviceProvider.getService(ConfigurationSource.class).getProperty(ConfigurationProperties.RETURNING_CLAUSE_CASE_SENSITIVE));
-            returningColumns = getReturningColumns(caseInsensitive, exampleQuerySql);
-            returningColumnTypes = dbmsDialect.needsReturningSqlTypes() ? getReturningColumnTypes(queryPlan, sfi) : null;
-        }
-
-        StringBuilder sqlSb = new StringBuilder(sqlOverride.length() + 100);
-        sqlSb.append(sqlOverride);
-        String finalSql = sqlSb.toString();
-        
-        try {
-            HibernateReturningResult<Object[]> returningResult = new HibernateReturningResult<Object[]>();
-            if (!queryPlanEntry.isFromCache()) {
-                prepareQueryPlan(queryPlan, queryParametersEntry.specifications, finalSql, session, modificationBaseQuery, true, dbmsDialect);
-                if (queryPlanCacheEnabled) {
-                    putQueryPlanIfAbsent(sfi, cacheKey, new QueryPlanCacheValue(queryPlan, returningColumns, returningColumnTypes));
-                }
-            }
-
-            if (queryPlan.getTranslators().length > 1) {
-                throw new IllegalArgumentException("No support for multiple translators yet!");
-            }
-
-            QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-
-            // If the DBMS doesn't support inclusion of cascading deletes in a with clause, we have to execute them manually
-            StatementExecutor executor = getExecutor(queryTranslator, session, modificationBaseQuery);
-            List<String> originalDeletes = Collections.emptyList();
-
-            if (executor != null && executor instanceof DeleteExecutor) {
-                originalDeletes = getField(executor, "deletes");
-            }
-
-            // Extract query loader for native listing
-            QueryLoader queryLoader = getField(queryTranslator, "queryLoader");
-            
-            // Do the native list operation with custom session and combined parameters
-            
-            /*
-             * NATIVE LIST START
-             */
-            hibernateAccess.checkTransactionSynchStatus(session);
-            queryParameters.validateParameters();
-            autoFlush(querySpaces, session);
-
-            List<Object[]> results = Collections.EMPTY_LIST;
-            boolean success = false;
-
-            try {
-                for (String delete : originalDeletes) {
-                    hibernateAccess.doExecute(executor, delete, queryParameters, session, queryParametersEntry.specifications);
-                }
-
-                results = hibernateAccess.list(queryLoader, wrapSession(session, dbmsDialect, returningColumns, returningColumnTypes, returningResult), queryParameters);
-                success = true;
-            } catch (QueryExecutionRequestException he) {
-                LOG.severe("Could not execute the following SQL query: " + finalSql);
-                throw new IllegalStateException(he);
-            } catch (TypeMismatchException e) {
-                LOG.severe("Could not execute the following SQL query: " + finalSql);
-                throw new IllegalArgumentException(e);
-            } catch (HibernateException he) {
-                LOG.severe("Could not execute the following SQL query: " + finalSql);
-                throw hibernateAccess.convert(em, he);
-            } finally {
-                hibernateAccess.afterTransaction(session, success);
-            }
-            /*
-             * NATIVE LIST END
-             */
-            
-            returningResult.setResultList(results);
-            return returningResult;
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-
-    public void autoFlush(Set<String> querySpaces, SessionImplementor sessionImplementor) {
-        AutoFlushEvent event = new AutoFlushEvent(querySpaces, (EventSource) sessionImplementor);
-        for (AutoFlushEventListener listener : sessionImplementor.getFactory().getServiceRegistry().getService(EventListenerRegistry.class).getEventListenerGroup(EventType.AUTO_FLUSH).listeners()) {
-            listener.onAutoFlush(event);
-        }
-    }
-
-    private static String[][] getReturningColumns(boolean caseInsensitive, String exampleQuerySql) {
-        int fromIndex = exampleQuerySql.indexOf("from");
-        int selectIndex = exampleQuerySql.indexOf("select");
-        String[] selectItems = splitSelectItems(exampleQuerySql.subSequence(selectIndex + "select".length() + 1, fromIndex));
-        String[][] returningColumns = new String[selectItems.length][2];
-        
-        for (int i = 0; i < selectItems.length; i++) {
-            String selectItemWithAlias = selectItems[i].substring(selectItems[i].lastIndexOf('.') + 1);
-            if (caseInsensitive) {
-                returningColumns[i][0] = selectItemWithAlias.substring(0, selectItemWithAlias.indexOf(' ')).toLowerCase();
-            } else {
-                returningColumns[i][0] = selectItemWithAlias.substring(0, selectItemWithAlias.indexOf(' '));
-            }
-            returningColumns[i][1] = selectItemWithAlias.substring(selectItemWithAlias.lastIndexOf(' ') + 1);
-        }
-        
-        return returningColumns;
-    }
-
-    private static int[] getReturningColumnTypes(HQLQueryPlan queryPlan, SessionFactoryImplementor sfi) {
-        List<Integer> sqlTypes = new ArrayList<>();
-        Type[] types = queryPlan.getReturnMetadata().getReturnTypes();
-
-        for (int i = 0; i < types.length; i++) {
-            int[] sqlTypeArray = types[i].sqlTypes(sfi);
-            for (int j = 0; j < sqlTypeArray.length; j++) {
-                sqlTypes.add(sqlTypeArray[j]);
-            }
-        }
-
-        int[] returningColumnTypes = new int[sqlTypes.size()];
-        for (int i = 0; i < sqlTypes.size(); i++) {
-            returningColumnTypes[i] = sqlTypes.get(i);
-        }
-
-        return returningColumnTypes;
-    }
-    
-    private static String[] splitSelectItems(CharSequence itemsString) {
-        List<String> selectItems = new ArrayList<String>();
-        StringBuilder sb = new StringBuilder();
-        int parenthesis = 0;
-        boolean text = false;
-        
-        int i = 0;
-        int length = itemsString.length();
-        while (i < length) {
-            char c = itemsString.charAt(i);
-            
-            if (text) {
-                if (c == '(') {
-                    parenthesis++;
-                } else if (c == ')') {
-                    parenthesis--;
-                } else if (parenthesis == 0 && c == ',') {
-                    selectItems.add(trim(sb));
-                    sb.setLength(0);
-                    text = false;
-                    
-                    i++;
-                    continue;
-                }
-                
-                sb.append(c);
-            } else {
-                if (Character.isWhitespace(c)) {
-                    // skip whitespace
-                } else {
-                    sb.append(c);
-                    text = true;
-                }
-            }
-            
-            i++;
-        }
-        
-        if (text) {
-            selectItems.add(trim(sb));
-        }
-        
-        return selectItems.toArray(new String[selectItems.size()]);
-    }
-
-    private static String trim(StringBuilder sb) {
-        int i = sb.length() - 1;
-        while (i >= 0) {
-            if (!Character.isWhitespace(sb.charAt(i))) {
-                break;
-            } else {
-                i--;
-            }
-        }
-        
-        return sb.substring(0, i + 1);
-    }
-    
-    private QueryParamEntry createQueryParameters(EntityManager em, Query query, List<Query> participatingQueries, List<String> queryStrings, Set<String> querySpaces) {
-        org.hibernate.Query hibernateQuery = query.unwrap(org.hibernate.Query.class);
-        List<ParameterSpecification> parameterSpecifications = new ArrayList<ParameterSpecification>();
-        
-        List<Type> types = new ArrayList<Type>();
-        List<Object> values = new ArrayList<Object>();
-        Map<String, TypedValue> namedParams = new LinkedHashMap<String, TypedValue>();
-        Serializable collectionKey = null;
-        LockOptions lockOptions = new LockOptions();
-        RowSelection originalRowSelection = hibernateAccess.getQueryParameters(query.unwrap(org.hibernate.Query.class), hibernateAccess.getNamedParams(hibernateQuery)).getRowSelection();
-        RowSelection rowSelection = new RowSelection();
-        rowSelection.setTimeout(originalRowSelection.getTimeout());
-        rowSelection.setFetchSize(originalRowSelection.getFetchSize());
-        if (originalRowSelection.getFirstRow() != null && originalRowSelection.getFirstRow() != 0) {
-            rowSelection.setFirstRow(originalRowSelection.getFirstRow());
-        }
-        if (originalRowSelection.getMaxRows() != null && originalRowSelection.getMaxRows() != Integer.MAX_VALUE) {
-            rowSelection.setMaxRows(originalRowSelection.getMaxRows());
-        }
-        boolean readOnly = false;
-        boolean cacheable = false;
-        String cacheRegion = null;
-        String comment = null;
-        List<String> queryHints = null;
-
-        for (Query participatingQuery : participatingQueries) {
-            org.hibernate.Query hibernateParticipatingQuery = participatingQuery.unwrap(org.hibernate.Query.class);
-            readOnly = readOnly || hibernateParticipatingQuery.isReadOnly();
-            cacheable = cacheable || hibernateAccess.getQueryParameters(hibernateParticipatingQuery, namedParams).isCacheable();
-            comment = comment != null ? comment : hibernateAccess.getQueryParameters(hibernateParticipatingQuery, namedParams).getComment();
-        }
-
-        for (QueryParamEntry queryParamEntry : getQueryParamEntries(em, participatingQueries, querySpaces)) {
-            queryStrings.add(queryParamEntry.queryString);
-
-            QueryParameters participatingQueryParameters = queryParamEntry.queryParameters;
-            // Merge parameters
-            Collections.addAll(types, participatingQueryParameters.getPositionalParameterTypes());
-            Collections.addAll(values, participatingQueryParameters.getPositionalParameterValues());
-            namedParams.putAll(participatingQueryParameters.getNamedParameters());
-            parameterSpecifications.addAll(queryParamEntry.specifications);
-
-            // Merge lock options
-            LockOptions originalLockOptions = participatingQueryParameters.getLockOptions();
-            if (originalLockOptions.getScope()) {
-                lockOptions.setScope(true);
-            }
-            if (originalLockOptions.getLockMode() != LockMode.NONE) {
-                if (lockOptions.getLockMode() != LockMode.NONE && lockOptions.getLockMode() != originalLockOptions.getLockMode()) {
-                    throw new IllegalStateException("Multiple different lock modes!");
-                }
-                lockOptions.setLockMode(originalLockOptions.getLockMode());
-            }
-            if (originalLockOptions.getTimeOut() != -1) {
-                if (lockOptions.getTimeOut() != -1 && lockOptions.getTimeOut() != originalLockOptions.getTimeOut()) {
-                    throw new IllegalStateException("Multiple different lock timeouts!");
-                }
-                lockOptions.setTimeOut(originalLockOptions.getTimeOut());
-            }
-            @SuppressWarnings("unchecked")
-            Iterator<Map.Entry<String, LockMode>> aliasLockIter = participatingQueryParameters.getLockOptions().getAliasLockIterator();
-            while (aliasLockIter.hasNext()) {
-                Map.Entry<String, LockMode> entry = aliasLockIter.next();
-                lockOptions.setAliasSpecificLockMode(entry.getKey(), entry.getValue());
-            }
-        }
-        
-        QueryParameters queryParameters = hibernateAccess.createQueryParameters(
-                  types.toArray(new Type[types.size()]),
-                  values.toArray(new Object[values.size()]),
-                  namedParams,
-                  lockOptions,
-                  rowSelection,
-                  true,
-                  readOnly,
-                  cacheable,
-                  cacheRegion,
-                  comment,
-                  queryHints,
-                  collectionKey == null ? null : new Serializable[] { collectionKey }
-        );
-        
-        return new QueryParamEntry(null, queryParameters, parameterSpecifications);
-    }
-
-    private SessionImplementor wrapSession(SessionImplementor session, DbmsDialect dbmsDialect, String[][] columns, int[] returningSqlTypes, HibernateReturningResult<?> returningResult) {
-        // We do all this wrapping to change the StatementPreparer that is returned by the JdbcCoordinator
-        // Instead of calling executeQuery, we delegate to executeUpdate and then return the generated keys in the prepared statement wrapper that we apply
-        return hibernateAccess.wrapSession(session, dbmsDialect, columns, returningSqlTypes, returningResult);
-    }
-    
-    private List<QueryParamEntry> getQueryParamEntries(EntityManager em, List<Query> queries, Set<String> querySpaces) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        SessionFactoryImplementor sfi = session.getFactory();
-        List<QueryParamEntry> result = new ArrayList<QueryParamEntry>(queries.size());
-        Deque<Query> queryQueue = new LinkedList<Query>(queries);
-        
-        while (queryQueue.size() > 0) {
-            Query q = queryQueue.remove();
-            if (q instanceof CteQueryWrapper) {
-                List<Query> participatingQueries = ((CteQueryWrapper) q).getParticipatingQueries();
-                for (int i = participatingQueries.size() - 1; i > -1; i--) {
-                    queryQueue.addFirst(participatingQueries.get(i));
-                }
-                continue;
-            }
-            
-            org.hibernate.Query hibernateQuery = q.unwrap(org.hibernate.Query.class);
-
-            Map<String, TypedValue> namedParams = new HashMap<String, TypedValue>(hibernateAccess.getNamedParams(hibernateQuery));
-            String queryString = hibernateAccess.expandParameterLists(session, hibernateQuery, namedParams);
-            
-            HQLQueryPlan queryPlan = sfi.getQueryPlanCache().getHQLQueryPlan(queryString, false, Collections.EMPTY_MAP);
-
-            if (queryPlan.getTranslators().length > 1) {
-                throw new IllegalArgumentException("No support for multiple translators yet!");
-            }
-
-            querySpaces.addAll(queryPlan.getQuerySpaces());
-
-            QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-            QueryParameters queryParameters;
-            List<ParameterSpecification> specifications;
-            
-            try {
-                queryParameters = hibernateAccess.getQueryParameters(hibernateQuery, namedParams);
-                specifications = getField(queryTranslator, "collectedParameterSpecifications");
-                
-                // This only happens for modification queries
-                if (specifications == null) {
-                    StatementExecutor executor = getStatementExecutor(queryTranslator);
-                    if (!(executor instanceof BasicExecutor)) {
-                        throw new IllegalArgumentException("Using polymorphic deletes/updates with CTEs is not yet supported");
-                    }
-                    specifications = getField(executor, "parameterSpecifications");
-                }
-            } catch (Exception e1) {
-                throw new RuntimeException(e1);
-            }
-            
-            result.add(new QueryParamEntry(queryString, queryParameters, specifications));
-        }
-        
-        return result;
-    }
-    
-    private StatementExecutor getStatementExecutor(QueryTranslator queryTranslator) {
-        return getField(queryTranslator, "statementExecutor");
-    }
-    
-    private void prepareQueryPlan(HQLQueryPlan queryPlan, List<ParameterSpecification> queryParameterSpecifications, String finalSql, SessionImplementor session, Query modificationBaseQuery, boolean isModification, DbmsDialect dbmsDialect) {
-        try {
-            if (queryPlan.getTranslators().length > 1) {
-                throw new IllegalArgumentException("No support for multiple translators yet!");
-            }
-
-            QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-            // Override the sql in the query plan
-            setField(queryTranslator, "sql", finalSql);
-
-            QueryLoader queryLoader = getField(queryTranslator, "queryLoader");
-            // INSERT statement does not have a query loader
-            if (queryLoader != null) {
-                setField(queryLoader, "factory", hibernateAccess.wrapSessionFactory(queryLoader.getFactory(), dbmsDialect));
-            }
-
-            // Modification queries keep the sql in the executor
-            StatementExecutor executor = null;
-            
-            Field statementExecutor = null;
-            boolean madeAccessible = false;
-            
-            try {
-                statementExecutor = ReflectionUtils.getField(queryTranslator.getClass(), "statementExecutor");
-                madeAccessible = !statementExecutor.isAccessible();
-                
-                if (madeAccessible) {
-                    statementExecutor.setAccessible(true);
-                }
-                
-                executor = (StatementExecutor) statementExecutor.get(queryTranslator);
-                
-                if (executor == null && isModification) {
-                    // We have to set an executor
-
-                    // The last query is our DML statement that contains the executor we need to alter
-                    org.hibernate.Query lastHibernateQuery = modificationBaseQuery.unwrap(org.hibernate.Query.class);
-                    Map<String, TypedValue> namedParams = new HashMap<String, TypedValue>(hibernateAccess.getNamedParams(lastHibernateQuery));
-                    String queryString = hibernateAccess.expandParameterLists(session, lastHibernateQuery, namedParams);
-                    
-                    // Create a fresh query to extract the executor which we can use
-                    HQLQueryPlan lastQueryPlan = new HQLQueryPlan(queryString, false, Collections.EMPTY_MAP, session.getFactory());
-                    if (lastQueryPlan.getTranslators().length > 1) {
-                        throw new IllegalArgumentException("No support for multiple translators yet!");
-                    }
-                    QueryTranslator lastQueryTranslator = lastQueryPlan.getTranslators()[0];
-                    executor = (StatementExecutor) statementExecutor.get(lastQueryTranslator);
-                    // Now we use this executor for our example query
-                    statementExecutor.set(queryTranslator, executor);
-                }
-            } finally {
-                if (madeAccessible) {
-                    statementExecutor.setAccessible(false);
-                }
-            }
-
-            if (executor != null) {
-                setField(executor, "sql", finalSql);
-                setField(executor, BasicExecutor.class, "parameterSpecifications", queryParameterSpecifications);
-                
-                if (executor instanceof DeleteExecutor) {
-                    int withIndex;
-                    if (dbmsDialect.supportsModificationQueryInWithClause()) {
-                        setField(executor, "deletes", new ArrayList<String>());
-                    } else if ((withIndex = finalSql.indexOf("with ")) != -1) {
-                        int end = getCTEEnd(finalSql, withIndex);
-
-                        List<String> originalDeletes = getField(executor, "deletes");
-                        int maxLength = 0;
-
-                        for (String s : originalDeletes) {
-                            maxLength = Math.max(maxLength, s.length());
-                        }
-
-                        List<String> deletes = new ArrayList<String>(originalDeletes.size());
-                        StringBuilder newSb = new StringBuilder(end + maxLength);
-                        // Prefix properly with cte
-                        StringBuilder withClauseSb = new StringBuilder(end - withIndex);
-                        withClauseSb.append(finalSql, withIndex, end);
-
-                        for (String s : originalDeletes) {
-                            // TODO: The strings should also receive the simple CTE name instead of the complex one
-                            newSb.append(s);
-                            dbmsDialect.appendExtendedSql(newSb, DbmsStatementType.DELETE, false, false, withClauseSb, null, null, null, null, null);
-                            deletes.add(newSb.toString());
-                            newSb.setLength(0);
-                        }
-
-                        setField(executor, "deletes", deletes);
-                    }
-                }
-            }
-            
-            // Prepare queryTranslator for aggregated parameters
-            ParameterTranslations translations = hibernateAccess.createParameterTranslations(queryParameterSpecifications);
-            setField(queryTranslator, "paramTranslations", translations);
-            setField(queryTranslator, "collectedParameterSpecifications", queryParameterSpecifications);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-
-    private StatementExecutor getExecutor(QueryTranslator queryTranslator, SessionImplementor session, Query lastQuery) {
-        // Modification queries keep the sql in the executor
-        StatementExecutor executor = null;
-
-        Field statementExectuor = null;
-        boolean madeAccessible = false;
-
-        try {
-            statementExectuor = ReflectionUtils.getField(queryTranslator.getClass(), "statementExecutor");
-            madeAccessible = !statementExectuor.isAccessible();
-
-            if (madeAccessible) {
-                statementExectuor.setAccessible(true);
-            }
-
-            executor = (StatementExecutor) statementExectuor.get(queryTranslator);
-
-            if (executor == null) {
-                // We have to set an executor
-                org.hibernate.Query lastHibernateQuery = lastQuery.unwrap(org.hibernate.Query.class);
-
-                Map<String, TypedValue> namedParams = new HashMap<String, TypedValue>(hibernateAccess.getNamedParams(lastHibernateQuery));
-                String queryString = hibernateAccess.expandParameterLists(session, lastHibernateQuery, namedParams);
-
-                // Extract the executor from the last query which is the actual main query
-                HQLQueryPlan lastQueryPlan = session.getFactory().getQueryPlanCache().getHQLQueryPlan(queryString, false, Collections.EMPTY_MAP);
-                if (lastQueryPlan.getTranslators().length > 1) {
-                    throw new IllegalArgumentException("No support for multiple translators yet!");
-                }
-                QueryTranslator lastQueryTranslator = lastQueryPlan.getTranslators()[0];
-                executor = (StatementExecutor) statementExectuor.get(lastQueryTranslator);
-            }
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        } finally {
-            if (madeAccessible) {
-                statementExectuor.setAccessible(false);
-            }
-        }
-
-        return executor;
-    }
-
-    private int getCTEEnd(String sql, int start) {
-        int parenthesis = 0;
-        QuoteMode mode = QuoteMode.NONE;
-        boolean started = false;
-
-        int i = start;
-        int end = sql.length();
-        OUTER: while (i < end) {
-            final char c = sql.charAt(i);
-            mode = mode.onChar(c);
-
-            if (mode == QuoteMode.NONE) {
-                if (c == '(') {
-                    started = true;
-                    parenthesis++;
-                } else if (c == ')') {
-                    parenthesis--;
-                } else if (started && parenthesis == 0 && c != ',' && !Character.isWhitespace(c)) {
-                    for (String statementType : KNOWN_STATEMENTS) {
-                        if (sql.regionMatches(true, i, statementType, 0, statementType.length())) {
-                            break OUTER;
-                        }
-                    }
-                }
-            }
-
-            i++;
-        }
-
-        return i;
-    }
-
-    private CacheEntry<QueryPlanCacheValue> getQueryPlan(SessionFactoryImplementor sfi, Query query, QueryPlanCacheKey cacheKey) {
-        QueryPlanCacheValue queryPlan;
-        boolean fromCache;
-        if (cacheKey == null) {
-            fromCache = false;
-            queryPlan = createQueryPlan(sfi, query);
-        } else {
-            BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue> queryPlanCache = getQueryPlanCache(sfi);
-            queryPlan = queryPlanCache.get(cacheKey);
-            if (queryPlan == null) {
-                fromCache = false;
-                queryPlan = createQueryPlan(sfi, query);
-            } else {
-                fromCache = true;
-            }
-        }
-        
-        return new CacheEntry<>(queryPlan, fromCache);
-    }
-    
-    private QueryPlanCacheValue putQueryPlanIfAbsent(SessionFactoryImplementor sfi, QueryPlanCacheKey cacheKey, QueryPlanCacheValue queryPlan) {
-        BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue> queryPlanCache = getQueryPlanCache(sfi);
-        return queryPlanCache.putIfAbsent(cacheKey, queryPlan);
-    }
-    
-    private QueryPlanCacheValue createQueryPlan(SessionFactoryImplementor sfi, Query query) {
-        org.hibernate.Query hibernateQuery = query.unwrap(org.hibernate.Query.class);
-        String queryString = hibernateQuery.getQueryString();
-        return new QueryPlanCacheValue(new HQLQueryPlan(queryString, false, Collections.EMPTY_MAP, sfi), null, null);
-    }
-    
-    private BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue> getQueryPlanCache(SessionFactoryImplementor sfi) {
-        BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue> queryPlanCache = queryPlanCachesCache.get(sfi);
-        if (queryPlanCache == null) {
-            queryPlanCache = new BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue>(QueryPlanCache.DEFAULT_QUERY_PLAN_MAX_COUNT, 20, BoundedConcurrentHashMap.Eviction.LIRS);
-            BoundedConcurrentHashMap<QueryPlanCacheKey, QueryPlanCacheValue> oldQueryPlanCache = queryPlanCachesCache.putIfAbsent(sfi, queryPlanCache);
-            if (oldQueryPlanCache != null) {
-                queryPlanCache = oldQueryPlanCache;
-            }
-        }
-        
-        return queryPlanCache;
-    }
-
-    private QueryPlanCacheKey createCacheKey(String sql, List<Query> queries, List<String> queryStrings) {
-        return createCacheKey(sql, queries, queryStrings, null, null);
-    }
-    
-    private QueryPlanCacheKey createCacheKey(String sql, List<Query> queries, List<String> queryStrings, Integer firstResult, Integer maxResults) {
-        List<QueryPlanCacheKeyComponent> cacheKeyComponents = new ArrayList<>(queries.size());
-        for (int i = 0; i < queries.size(); i++) {
-            Query query = queries.get(i);
-            String queryString = queryStrings.get(i);
-            cacheKeyComponents.add(new QueryPlanCacheKeyComponent(queryString, query.getFirstResult(), query.getMaxResults()));
-        }
-        return new QueryPlanCacheKey(sql, cacheKeyComponents, firstResult, maxResults);
-    }
-    
-    private void addAll(List<Query> queries, List<String> parts) {
-        for (int i = 0; i < queries.size(); i++) {
-            Query query = queries.get(i);
-            
-            if (query instanceof CteQueryWrapper) {
-                addAll(((CteQueryWrapper) query).getParticipatingQueries(), parts);
-            } else {
-                parts.add(query.unwrap(org.hibernate.Query.class).getQueryString());
-            }
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class QueryParamEntry {
-        final String queryString;
-        final QueryParameters queryParameters;
-        final List<ParameterSpecification> specifications;
-        
-        public QueryParamEntry(String queryString, QueryParameters queryParameters, List<ParameterSpecification> specifications) {
-            this.queryString = queryString;
-            this.queryParameters = queryParameters;
-            this.specifications = specifications;
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @since 1.5.0
-     */
-    private static class QueryPlanCacheKey {
-        final String sql;
-        final List<QueryPlanCacheKeyComponent> cacheKeyComponents;
-        final Integer firstResult;
-        final Integer maxResults;
-
-        public QueryPlanCacheKey(String sql, List<QueryPlanCacheKeyComponent> cacheKeyComponents) {
-            this.sql = sql;
-            this.cacheKeyComponents = cacheKeyComponents;
-            this.firstResult = null;
-            this.maxResults = null;
-        }
-
-        public QueryPlanCacheKey(String sql, List<QueryPlanCacheKeyComponent> cacheKeyComponents, Integer firstResult, Integer maxResults) {
-            this.sql = sql;
-            this.cacheKeyComponents = cacheKeyComponents;
-            this.firstResult = firstResult;
-            this.maxResults = maxResults;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            QueryPlanCacheKey that = (QueryPlanCacheKey) o;
-            return Objects.equals(sql, that.sql) &&
-                    cacheKeyComponents.equals(that.cacheKeyComponents) &&
-                    Objects.equals(firstResult, that.firstResult) &&
-                    Objects.equals(maxResults, that.maxResults);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(sql, cacheKeyComponents, firstResult, maxResults);
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class QueryPlanCacheKeyComponent {
-        final String query;
-        final Integer firstResult;
-        final Integer maxResults;
-
-        public QueryPlanCacheKeyComponent(String query) {
-            this.query = query;
-            this.firstResult = null;
-            this.maxResults = null;
-        }
-
-        public QueryPlanCacheKeyComponent(String query, Integer firstResult, Integer maxResults) {
-            this.query = query;
-            this.firstResult = firstResult;
-            this.maxResults = maxResults;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof QueryPlanCacheKeyComponent)) {
-                return false;
-            }
-
-            QueryPlanCacheKeyComponent that = (QueryPlanCacheKeyComponent) o;
-
-            if (!query.equals(that.query)) {
-                return false;
-            }
-            if (firstResult != null ? !firstResult.equals(that.firstResult) : that.firstResult != null) {
-                return false;
-            }
-            return maxResults != null ? maxResults.equals(that.maxResults) : that.maxResults == null;
-
-        }
-
-        @Override
-        public int hashCode() {
-            int result = query.hashCode();
-            result = 31 * result + (firstResult != null ? firstResult.hashCode() : 0);
-            result = 31 * result + (maxResults != null ? maxResults.hashCode() : 0);
-            return result;
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class CacheEntry<T> {
-        
-        private final T value;
-        private final boolean fromCache;
-        
-        public CacheEntry(T value, boolean fromCache) {
-            this.value = value;
-            this.fromCache = fromCache;
-        }
-
-        public T getValue() {
-            return value;
-        }
-
-        public boolean isFromCache() {
-            return fromCache;
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @since 1.6.0
-     */
-    private static class QueryPlanCacheValue {
-        private final HQLQueryPlan queryPlan;
-        private final String[][] returningColumns;
-        private final int[] returningColumnTypes;
-
-        private QueryPlanCacheValue(HQLQueryPlan queryPlan, String[][] returningColumns, int[] returningColumnTypes) {
-            this.queryPlan = queryPlan;
-            this.returningColumns = returningColumns;
-            this.returningColumnTypes = returningColumnTypes;
-        }
-
-        public HQLQueryPlan getQueryPlan() {
-            return queryPlan;
-        }
-
-        public String[][] getReturningColumns() {
-            return returningColumns;
-        }
-
-        public int[] getReturningColumnTypes() {
-            return returningColumnTypes;
-        }
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.5.0
-     */
-    private static class FieldKey {
-
-        private final Class<?> clazz;
-        private final Class<?> expectClazz;
-        private final String fieldName;
-
-        public FieldKey(Class<?> clazz, Class<?> expectClazz, String fieldName) {
-            this.clazz = clazz;
-            this.expectClazz = expectClazz;
-            this.fieldName = fieldName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof FieldKey)) {
-                return false;
-            }
-
-            FieldKey fieldKey = (FieldKey) o;
-            return clazz.equals(fieldKey.clazz)
-                    && expectClazz.equals(fieldKey.expectClazz)
-                    && fieldName.equals(fieldKey.fieldName);
-        }
-
-        @Override
-        public int hashCode() {
-            int result = clazz.hashCode();
-            result = 31 * result + expectClazz.hashCode();
-            result = 31 * result + fieldName.hashCode();
-            return result;
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private <T> T getField(Object object, String field) {
-        FieldKey key = new FieldKey(object.getClass(), object.getClass(), field);
-        Field f = fieldCache.get(key);
-        try {
-            if (f == null) {
-                f = ReflectionUtils.getField(object.getClass(), field);
-                f.setAccessible(true);
-                fieldCache.put(key, f);
-            }
-            return (T) f.get(object);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-
-    private void setField(Object object, String field, Object value) {
-        setField(object, object.getClass(), field, value);
-    }
-    
-    private void setField(Object object, Class<?> clazz, String field, Object value) {
-        FieldKey key = new FieldKey(object.getClass(), clazz, field);
-        Field f = fieldCache.get(key);
-        try {
-            if (f == null) {
-                f = ReflectionUtils.getField(clazz, field);
-                if (f == null) {
-                    f = ReflectionUtils.getField(object.getClass(), field);
-                }
-                f.setAccessible(true);
-                fieldCache.put(key, f);
-            }
-            f.set(object, value);
-        } catch (Exception e1) {
-            throw new RuntimeException(e1);
-        }
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpa21Provider.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpa21Provider.java
deleted file mode 100644
index 58cc3479c6..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpa21Provider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.engine.spi.CascadingAction;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.type.ComponentType;
-import org.hibernate.type.Type;
-
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.metamodel.ManagedType;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class HibernateJpa21Provider extends HibernateJpaProvider {
-
-    private static final Method HAS_ORPHAN_DELETE_METHOD;
-    private static final Method DO_CASCADE_METHOD;
-    private static final CascadingAction DELETE_CASCADE;
-    static {
-        try {
-            Class<?> cascadeStyleClass = Class.forName("org.hibernate.engine.spi.CascadeStyle");
-            HAS_ORPHAN_DELETE_METHOD = cascadeStyleClass.getMethod("hasOrphanDelete");
-            DO_CASCADE_METHOD = cascadeStyleClass.getMethod("doCascade", CascadingAction.class);
-            DELETE_CASCADE = (CascadingAction) Class.forName("org.hibernate.engine.spi.CascadingActions").getField("DELETE").get(null);
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not access cascading information. Please report your version of hibernate so we can provide support for it!", ex);
-        }
-    }
-
-    public HibernateJpa21Provider(PersistenceUnitUtil persistenceUnitUtil, String dbms, Map<String, EntityPersister> entityPersisters, Map<String, CollectionPersister> collectionPersisters, int major, int minor, int fix, String type) {
-        super(persistenceUnitUtil, dbms, entityPersisters, collectionPersisters, major, minor, fix, type);
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        if (entityPersister != null) {
-            EntityMetamodel entityMetamodel = entityPersister.getEntityMetamodel();
-            Integer index = entityMetamodel.getPropertyIndexOrNull(attributeName);
-            if (index != null) {
-                try {
-                    return (boolean) HAS_ORPHAN_DELETE_METHOD.invoke(entityMetamodel.getCascadeStyles()[index]);
-                } catch (Exception ex) {
-                    throw new RuntimeException("Could not access orphan removal information. Please report your version of hibernate so we can provide support for it!", ex);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        Type elementType = getCollectionPersister(ownerType, elementCollectionPath).getElementType();
-        if (!(elementType instanceof ComponentType)) {
-            // This can only happen for collection/join table target attributes, where it is irrelevant
-            return false;
-        }
-        ComponentType componentType = (ComponentType) elementType;
-        String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-        // Component types only store direct properties, so we have to go deeper
-        String[] propertyParts = subAttribute.split("\\.");
-        int propertyIndex = 0;
-        for (; propertyIndex < propertyParts.length - 1; propertyIndex++) {
-            int index = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            Type propertyType = componentType.getSubtypes()[index];
-            if (propertyType instanceof ComponentType) {
-                componentType = (ComponentType) propertyType;
-            } else {
-                // The association property is just as good as the id property of the association for our purposes
-                // So we stop here and query the association property instead
-                break;
-            }
-        }
-
-        try {
-            int leafPropertyIndex = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            return (boolean) HAS_ORPHAN_DELETE_METHOD.invoke(componentType.getCascadeStyle(leafPropertyIndex));
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not access orphan removal information. Please report your version of hibernate so we can provide support for it!", ex);
-        }
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        if (entityPersister != null) {
-            EntityMetamodel entityMetamodel = entityPersister.getEntityMetamodel();
-            Integer index = entityMetamodel.getPropertyIndexOrNull(attributeName);
-            if (index != null) {
-                try {
-                    return (boolean) DO_CASCADE_METHOD.invoke(entityMetamodel.getCascadeStyles()[index], DELETE_CASCADE);
-                } catch (Exception ex) {
-                    throw new RuntimeException("Could not access orphan removal information. Please report your version of hibernate so we can provide support for it!", ex);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        Type elementType = getCollectionPersister(ownerType, elementCollectionPath).getElementType();
-        if (!(elementType instanceof ComponentType)) {
-            // This can only happen for collection/join table target attributes, where it is irrelevant
-            return false;
-        }
-        ComponentType componentType = (ComponentType) elementType;
-        String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-        // Component types only store direct properties, so we have to go deeper
-        String[] propertyParts = subAttribute.split("\\.");
-        int propertyIndex = 0;
-        for (; propertyIndex < propertyParts.length - 1; propertyIndex++) {
-            int index = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            Type propertyType = componentType.getSubtypes()[index];
-            if (propertyType instanceof ComponentType) {
-                componentType = (ComponentType) propertyType;
-            } else {
-                // The association property is just as good as the id property of the association for our purposes
-                // So we stop here and query the association property instead
-                break;
-            }
-        }
-        try {
-            int leafPropertyIndex = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            return (boolean) DO_CASCADE_METHOD.invoke(componentType.getCascadeStyle(leafPropertyIndex), DELETE_CASCADE);
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not access orphan removal information. Please report your version of hibernate so we can provide support for it!", ex);
-        }
-    }
-
-    @Override
-    public boolean supportsJpa21() {
-        return true;
-    }
-
-    @Override
-    public String getOnClause() {
-        return "ON";
-    }
-
-    @Override
-    public boolean supportsTreatJoin() {
-        return true;
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java
deleted file mode 100644
index 6a6b008b76..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java
+++ /dev/null
@@ -1,1848 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import com.blazebit.persistence.JoinType;
-import com.blazebit.persistence.integration.jpa.JpaMetamodelAccessorImpl;
-import com.blazebit.persistence.spi.JoinTable;
-import com.blazebit.persistence.spi.JpaMetamodelAccessor;
-import com.blazebit.persistence.spi.JpaProvider;
-import org.hibernate.Hibernate;
-import org.hibernate.MappingException;
-import org.hibernate.QueryException;
-import org.hibernate.engine.query.spi.ParameterMetadata;
-import org.hibernate.engine.spi.CascadingAction;
-import org.hibernate.engine.spi.EntityKey;
-import org.hibernate.engine.spi.Mapping;
-import org.hibernate.engine.spi.PersistenceContext;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Table;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.collection.OneToManyPersister;
-import org.hibernate.persister.collection.QueryableCollection;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.Joinable;
-import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
-import org.hibernate.persister.entity.Queryable;
-import org.hibernate.persister.entity.SingleTableEntityPersister;
-import org.hibernate.persister.entity.UnionSubclassEntityPersister;
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.LazyInitializer;
-import org.hibernate.sql.InFragment;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.type.AssociationType;
-import org.hibernate.type.CollectionType;
-import org.hibernate.type.ComponentType;
-import org.hibernate.type.CompositeType;
-import org.hibernate.type.CustomType;
-import org.hibernate.type.EmbeddedComponentType;
-import org.hibernate.type.ForeignKeyDirection;
-import org.hibernate.type.ManyToOneType;
-import org.hibernate.type.OneToOneType;
-import org.hibernate.type.Type;
-import org.hibernate.usertype.EnhancedUserType;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class HibernateJpaProvider implements JpaProvider {
-
-    private static final Method GET_TYPE_NAME;
-    private static final Method IS_NULLABLE;
-    private static final Method GET_PARAMETER_METADATA;
-    private static final Logger LOG = Logger.getLogger(HibernateJpaProvider.class.getName());
-
-    protected final PersistenceUnitUtil persistenceUnitUtil;
-    protected final DB db;
-    protected final Map<String, EntityPersister> entityPersisters;
-    protected final Map<String, CollectionPersister> collectionPersisters;
-
-    private final boolean useQuoted;
-    private final boolean supportsEntityJoin;
-    private final boolean needsJoinSubqueryRewrite;
-    private final boolean supportsForeignAssociationInOnClause;
-    private final boolean needsAssociationToIdRewriteInOnClause;
-    private final boolean needsBrokenAssociationToIdRewriteInOnClause;
-    private final boolean supportsCollectionTableCleanupOnDelete;
-    private final boolean supportsJoinTableCleanupOnDelete;
-    private final boolean needsCorrelationPredicateWhenCorrelatingWithWhereClause;
-    private final boolean supportsSingleValuedAssociationNaturalIdExpressions;
-    private final boolean supportsTableGroupJoins;
-    private final boolean needsElementCollectionIdCutoffForCompositeIdOwner;
-    private final boolean supportsNonDrivingAliasInOnClause;
-
-    static {
-        Class<?> typeClass = null;
-        // Hibernate 5.2+
-        try {
-            typeClass = Class.forName("org.hibernate.metamodel.internal.AbstractType");
-        } catch (ClassNotFoundException cnfe) {
-            // Ignore
-        }
-        // Hibernate 5.4+
-        if (typeClass == null) {
-            try {
-                typeClass = Class.forName("org.hibernate.metamodel.model.domain.internal.AbstractType");
-            } catch (ClassNotFoundException cnfe) {
-                // Ignore
-            }
-        }
-        // Hibernate 4.3+
-        if (typeClass == null) {
-            try {
-                typeClass = Class.forName("org.hibernate.jpa.internal.metamodel.AbstractType");
-            } catch (ClassNotFoundException cnfe) {
-                // Ignore
-            }
-        }
-        // Hibernate 4.2
-        if (typeClass == null) {
-            try {
-                typeClass = Class.forName("org.hibernate.ejb.metamodel.AbstractType");
-            } catch (ClassNotFoundException cnfe) {
-                // Ignore
-            }
-        }
-        if (typeClass != null) {
-            try {
-                GET_TYPE_NAME = typeClass.getMethod("getTypeName");
-            } catch (NoSuchMethodException e) {
-                throw new IllegalStateException("Unknown Hibernate version in use, could not find getTypeName method!", e);
-            }
-        } else {
-            throw new IllegalStateException("Unknown Hibernate version in use, could not find AbstractType JPA metamodel class!");
-        }
-
-        try {
-            Method isNullable = org.hibernate.type.EntityType.class.getDeclaredMethod("isNullable");
-            isNullable.setAccessible(true);
-            IS_NULLABLE = isNullable;
-        } catch (Exception ex) {
-            throw new IllegalStateException("Unknown Hibernate version in use, could not find isNullable method!", ex);
-        }
-        Method getParameterMetadata = null;
-        try {
-            getParameterMetadata = Class.forName("org.hibernate.internal.AbstractQueryImpl").getMethod("getParameterMetadata");
-        } catch (Exception cnfe) {
-            // Ignore, as that means the Hibernate version does not need this method
-        }
-        GET_PARAMETER_METADATA = getParameterMetadata;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static enum DB {
-        OTHER,
-        MY_SQL,
-        DB2,
-        MSSQL;
-    }
-
-    public HibernateJpaProvider(PersistenceUnitUtil persistenceUnitUtil, String dbms, Map<String, EntityPersister> entityPersisters, Map<String, CollectionPersister> collectionPersisters, int major, int minor, int fix, String type) {
-        this.persistenceUnitUtil = persistenceUnitUtil;
-        try {
-            if ("mysql".equals(dbms) || "mysql8".equals(dbms)) {
-                db = DB.MY_SQL;
-            } else if ("db2".equals(dbms)) {
-                db = DB.DB2;
-            } else if ("microsoft".equals(dbms)) {
-                db = DB.MSSQL;
-            } else {
-                db = DB.OTHER;
-            }
-            this.entityPersisters = entityPersisters;
-            this.collectionPersisters = collectionPersisters;
-            // Since Hibernate 5.0 the physical schema uses quoted identifiers as well
-            this.useQuoted = major > 4;
-            this.supportsEntityJoin = major > 5 || major == 5 && minor >= 1;
-            this.supportsNonDrivingAliasInOnClause = major > 5 || major == 5 && minor >= 2;
-            // Got fixed in 5.2.3: https://hibernate.atlassian.net/browse/HHH-9329 but is still buggy: https://hibernate.atlassian.net/browse/HHH-11401
-            this.needsJoinSubqueryRewrite = major < 5 || major == 5 && minor < 2 || major == 5 && minor == 2 && fix < 7;
-            // Got fixed in 5.2.8: https://hibernate.atlassian.net/browse/HHH-11450
-            this.supportsForeignAssociationInOnClause = major > 5 || major == 5 && minor > 2 || major == 5 && minor == 2 && fix >= 8;
-            // Got fixed in 5.2.7: https://hibernate.atlassian.net/browse/HHH-2772
-            this.needsAssociationToIdRewriteInOnClause = major < 5 || major == 5 && minor < 2 || major == 5 && minor == 2 && fix < 7;
-            // Got fixed in 5.1.0: https://hibernate.atlassian.net/browse/HHH-7321
-            this.needsBrokenAssociationToIdRewriteInOnClause = major < 5 || major == 5 && minor < 1;
-            // Going to make this configurable in Hibernate in a future version
-            this.supportsCollectionTableCleanupOnDelete = false;
-            this.supportsJoinTableCleanupOnDelete = true;
-            // See https://hibernate.atlassian.net/browse/HHH-12942 for details
-            this.needsCorrelationPredicateWhenCorrelatingWithWhereClause = true;
-            // See https://hibernate.atlassian.net/browse/HHH-12775 for details
-            this.supportsSingleValuedAssociationNaturalIdExpressions = major > 5 || major == 5 && minor >= 4;
-            // See https://hibernate.atlassian.net/browse/HHH-13045 for details
-            this.needsElementCollectionIdCutoffForCompositeIdOwner = major < 5 || major == 5 && minor < 4;
-            // Table group joins are added in Hibernate 5.2.8
-            this.supportsTableGroupJoins = major > 5 || (major == 5 && (minor > 2 || (minor == 2 && fix >= 8)));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public boolean supportsEntityJoin() {
-        return supportsEntityJoin;
-    }
-
-    @Override
-    public boolean supportsCrossJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean needsJoinSubqueryRewrite() {
-        return needsJoinSubqueryRewrite;
-    }
-
-    @Override
-    public boolean supportsForeignAssociationInOnClause() {
-        return supportsForeignAssociationInOnClause;
-    }
-
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return needsAssociationToIdRewriteInOnClause;
-    }
-
-    @Override
-    public boolean needsBrokenAssociationToIdRewriteInOnClause() {
-        return needsBrokenAssociationToIdRewriteInOnClause;
-    }
-
-    @Override
-    public boolean supportsCollectionTableCleanupOnDelete() {
-        return supportsCollectionTableCleanupOnDelete;
-    }
-
-    @Override
-    public boolean supportsJoinTableCleanupOnDelete() {
-        return supportsJoinTableCleanupOnDelete;
-    }
-
-    @Override
-    public boolean needsCorrelationPredicateWhenCorrelatingWithWhereClause() {
-        return needsCorrelationPredicateWhenCorrelatingWithWhereClause;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationNaturalIdExpressions() {
-        return supportsSingleValuedAssociationNaturalIdExpressions;
-    }
-
-    @Override
-    public boolean supportsGroupByEntityAlias() {
-        return false;
-    }
-
-    @Override
-    public boolean needsElementCollectionIdCutoff() {
-        return needsElementCollectionIdCutoffForCompositeIdOwner;
-    }
-
-    @Override
-    public boolean needsUnproxyForFieldAccess() {
-        return true;
-    }
-
-    @Override
-    public boolean needsCaseWhenElseBranch() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsLikePatternEscape() {
-        // Not yet supported
-        return false;
-    }
-
-    @Override
-    public boolean supportsJpa21() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsInsertStatement() {
-        return true;
-    }
-
-    @Override
-    public boolean needsBracketsForListParameter() {
-        return true;
-    }
-
-    @Override
-    public String getBooleanExpression(boolean value) {
-        return value ? "CASE WHEN 1 = 1 THEN true ELSE false END" : "CASE WHEN 1 = 1 THEN false ELSE true END";
-    }
-
-    @Override
-    public String getBooleanConditionalExpression(boolean value) {
-        return value ? "1 = 1" : "1 = 0";
-    }
-
-    @Override
-    public String getNullExpression() {
-        return "NULLFN()";
-    }
-
-    @Override
-    public String escapeCharacter(char character) {
-        if (character == '\\' && db == DB.MY_SQL) {
-            return "\\\\";
-        } else {
-            return Character.toString(character);
-        }
-    }
-
-    @Override
-    public boolean supportsNullPrecedenceExpression() {
-        return db == DB.OTHER;
-    }
-
-    @Override
-    public void renderNullPrecedence(StringBuilder sb, String expression, String resolvedExpression, String order, String nulls) {
-        if (nulls != null) {
-            if (db != DB.OTHER) {
-                if (db == DB.DB2) {
-                    if (("FIRST".equals(nulls) && "DESC".equalsIgnoreCase(order)) || "LAST".equals(nulls) && "ASC".equalsIgnoreCase(order)) {
-                        // According to DB2 docs, the following are the defaults
-                        // ASC + NULLS LAST
-                        // DESC + NULLS FIRST
-                        sb.append(expression);
-                        sb.append(" ").append(order);
-                        return;
-                    }
-                } else if (db == DB.MSSQL) {
-                    if ("ASC".equalsIgnoreCase(order) && "FIRST".equals(nulls) || "DESC".equalsIgnoreCase(order) && "LAST".equals(nulls)) {
-                        // The following are the defaults, so just let them through
-                        // ASC + NULLS FIRST
-                        // DESC + NULLS LAST
-                        sb.append(expression);
-                        sb.append(" ").append(order);
-                        return;
-                    }
-                }
-
-                // According to the following, MySQL sorts NULLS FIRST when ASC and NULLS LAST when DESC, so we only need the expression for opposite cases
-                // https://dev.mysql.com/doc/refman/8.0/en/working-with-null.html
-                if (db != DB.MY_SQL || "ASC".equalsIgnoreCase(order) && "LAST".equals(nulls) || "DESC".equalsIgnoreCase(order) && "FIRST".equals(nulls)) {
-                    // Unfortunately we have to take care of that our selves because the SQL generation has a bug for MySQL: HHH-10241
-                    sb.append("CASE WHEN ").append(resolvedExpression != null ? resolvedExpression : expression).append(" IS NULL THEN ");
-                    if ("FIRST".equals(nulls)) {
-                        sb.append("0 ELSE 1");
-                    } else {
-                        sb.append("1 ELSE 0");
-                    }
-                    sb.append(" END, ");
-                }
-                sb.append(expression);
-                if (order != null) {
-                    sb.append(" ").append(order);
-                }
-            } else {
-                sb.append(expression);
-                if (order != null) {
-                    sb.append(' ').append(order).append(" NULLS ").append(nulls);
-                }
-            }
-        } else {
-            sb.append(expression);
-            if (order != null) {
-                sb.append(' ').append(order);
-            }
-        }
-    }
-
-    @Override
-    public String getOnClause() {
-        return "WITH";
-    }
-
-    @Override
-    public String getCollectionValueFunction() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCollectionValueDereference() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueryLimitOffset() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSetOperations() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsListagg() {
-        return false;
-    }
-
-    @Override
-    public Class<?> getDefaultQueryResultType() {
-        return Object.class;
-    }
-
-    @Override
-    public String getCustomFunctionInvocation(String functionName, int argumentCount) {
-        // Careful, PaginatedCriteriaBuilder has some dependency on the "length" of the string for rendering in the count query
-        return functionName + "(";
-    }
-
-    @Override
-    public boolean supportsRootTreat() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTreatCorrelation() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypePropertyResolving() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubtypeRelationResolving() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCountStar() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCountTuple() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCustomFunctions() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonScalarSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryInFunction() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSubqueryAliasShadowing() {
-        return true;
-    }
-
-    protected final String getTypeName(ManagedType<?> ownerType) {
-        Class<?> javaType = ownerType.getJavaType();
-        return javaType == null || javaType == Map.class ? ((EntityType<?>) ownerType).getName() : javaType.getName();
-    }
-
-    protected final AbstractEntityPersister getEntityPersister(ManagedType<?> ownerType) {
-        Class<?> javaType = ownerType.getJavaType();
-        EntityPersister entityPersister;
-        if (ownerType instanceof EntityType<?> && (javaType == null || javaType == Map.class) ) {
-            entityPersister = entityPersisters.get(((EntityType<?>) ownerType).getName());
-        } else {
-            entityPersister = entityPersisters.get(javaType.getName());
-        }
-        if (entityPersister == null) {
-            try {
-                entityPersister = entityPersisters.get(GET_TYPE_NAME.invoke(ownerType));
-            } catch (Exception e) {
-                throw new IllegalArgumentException("Couldn't get type name!", e);
-            }
-        }
-        return (AbstractEntityPersister) entityPersister;
-    }
-
-    protected final QueryableCollection getCollectionPersister(ManagedType<?> ownerType, String attributeName) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        QueryableCollection collection;
-        do {
-            String ownerTypeName = entityPersister.getName();
-            StringBuilder sb = new StringBuilder(ownerTypeName.length() + attributeName.length() + 1);
-            sb.append(ownerTypeName);
-            sb.append('.');
-            sb.append(attributeName);
-
-            collection = (QueryableCollection) collectionPersisters.get(sb.toString());
-            if (collection == null) {
-                String superclass = entityPersister.getEntityMetamodel().getSuperclass();
-                entityPersister = superclass == null ? null : (AbstractEntityPersister) entityPersisters.get(superclass);
-            }
-        } while (collection == null && entityPersister != null);
-
-        return collection;
-    }
-
-    @Override
-    public String[] getDiscriminatorColumnCheck(EntityType<?> entityType) {
-        AbstractEntityPersister entityPersister = getEntityPersister(entityType);
-        if (entityPersister.isInherited()) {
-            String discriminatorColumnName = entityPersister.getDiscriminatorColumnName();
-            String discriminatorSQLValue = entityPersister.getDiscriminatorSQLValue();
-            return new String[]{ discriminatorColumnName, discriminatorSQLValue };
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
-        AbstractEntityPersister persister = getEntityPersister(ownerType);
-        Type propertyType = getPropertyType(persister, attributeName);
-
-        if (propertyType instanceof org.hibernate.type.EntityType) {
-            org.hibernate.type.EntityType entityType = (org.hibernate.type.EntityType) propertyType;
-            // As of Hibernate 5.4 we noticed that we have to treat nullable associations as "foreign" as well
-            if (isNullable(entityType)) {
-                return true;
-            }
-
-            // OneToOnes can't have JoinTables as per spec
-            // ManyToOnes can have JoinTables, which can be treated as non-foreign
-            // if table group joins are supported.
-            if (supportsTableGroupJoins || propertyType instanceof OneToOneType) {
-                return entityType.getRHSUniqueKeyPropertyName() != null && !supportsSingleValuedAssociationNaturalIdExpressions;
-            }
-        }
-
-        // Every entity persister has "owned" properties on table number 0, others have higher numbers
-        int tableNumber = persister.getSubclassPropertyTableNumber(attributeName);
-        return tableNumber >= persister.getEntityMetamodel().getSubclassEntityNames().size();
-    }
-
-    private boolean isNullable(org.hibernate.type.EntityType oneToOneType) {
-        try {
-            return (boolean) IS_NULLABLE.invoke(oneToOneType);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public boolean isColumnShared(EntityType<?> ownerType, String attributeName) {
-        AbstractEntityPersister persister = getEntityPersister(ownerType);
-        if (!(persister instanceof SingleTableEntityPersister) && !(persister instanceof UnionSubclassEntityPersister)) {
-            return false;
-        }
-
-        if (persister instanceof SingleTableEntityPersister) {
-            SingleTableEntityPersister singleTableEntityPersister = (SingleTableEntityPersister) persister;
-            SingleTableEntityPersister rootPersister = (SingleTableEntityPersister) entityPersisters.get(singleTableEntityPersister.getRootEntityName());
-            return isColumnShared(singleTableEntityPersister, rootPersister.getName(), rootPersister.getSubclassClosure(), attributeName);
-        } else if (persister instanceof UnionSubclassEntityPersister) {
-            UnionSubclassEntityPersister unionSubclassEntityPersister = (UnionSubclassEntityPersister) persister;
-            UnionSubclassEntityPersister rootPersister = (UnionSubclassEntityPersister) entityPersisters.get(unionSubclassEntityPersister.getRootEntityName());
-            return isColumnShared(unionSubclassEntityPersister, rootPersister.getName(), rootPersister.getSubclassClosure(), attributeName);
-        }
-
-        return false;
-    }
-
-    @Override
-    public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attributeName, JoinType joinType) {
-        // When we don't support treat joins(Hibernate 4.2), we need to put the constraints into the WHERE clause
-        if (!supportsTreatJoin() && joinType == JoinType.INNER) {
-            return ConstraintType.WHERE;
-        }
-        AbstractEntityPersister persister = getEntityPersister(ownerType);
-        Type propertyType = getPropertyType(persister, attributeName);
-
-        if (!(propertyType instanceof AssociationType)) {
-            return ConstraintType.NONE;
-        }
-
-        // When the inner treat joined element is collection, we always need the constraint, see HHH-??? TODO: report issue
-        if (propertyType instanceof CollectionType) {
-            if (joinType == JoinType.INNER) {
-                if (isForeignKeyDirectionToParent((CollectionType) propertyType)) {
-                    return ConstraintType.WHERE;
-                }
-
-                return ConstraintType.ON;
-            } else if (!((CollectionType) propertyType).getElementType(persister.getFactory()).isEntityType()) {
-                return ConstraintType.NONE;
-            }
-        }
-
-        String propertyEntityName = ((AssociationType) propertyType).getAssociatedEntityName(persister.getFactory());
-        AbstractEntityPersister propertyTypePersister = (AbstractEntityPersister) entityPersisters.get(propertyEntityName);
-
-        // When the treat joined element is a union subclass, we always need the constraint, see HHH-??? TODO: report issue
-        if (propertyTypePersister instanceof UnionSubclassEntityPersister) {
-            return ConstraintType.ON;
-        }
-
-        return ConstraintType.NONE;
-    }
-
-    protected boolean isForeignKeyDirectionToParent(org.hibernate.type.EntityType entityType) {
-        ForeignKeyDirection direction = entityType.getForeignKeyDirection();
-        // Types changed between 4 and 5 so we check it like this. Essentially we check if the TO_PARENT direction is used
-        return direction.toString().regionMatches(true, 0, "to", 0, 2);
-    }
-
-    protected boolean isForeignKeyDirectionToParent(CollectionType collectionType) {
-        ForeignKeyDirection direction = collectionType.getForeignKeyDirection();
-        // Types changed between 4 and 5 so we check it like this. Essentially we check if the TO_PARENT direction is used
-        return direction.toString().regionMatches(true, 0, "to", 0, 2);
-    }
-
-    private boolean isColumnShared(AbstractEntityPersister persister, String rootName, String[] subclassNames, String attributeName) {
-        String[] columnNames = persister.getSubclassPropertyColumnNames(attributeName);
-        for (String subclass: subclassNames) {
-            if (!subclass.equals(persister.getName()) && !subclass.equals(rootName)) {
-                AbstractEntityPersister subclassPersister = (AbstractEntityPersister) entityPersisters.get(subclass);
-                if (isColumnShared(subclassPersister, columnNames)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean isColumnShared(AbstractEntityPersister subclassPersister, String[] columnNames) {
-        List<String> propertiesToCheck = new ArrayList<>(Arrays.asList(subclassPersister.getPropertyNames()));
-        while (!propertiesToCheck.isEmpty()) {
-            String propertyName = propertiesToCheck.remove(propertiesToCheck.size() - 1);
-            Type propertyType = getPropertyType(subclassPersister, propertyName);
-            if (propertyType instanceof ComponentType) {
-                ComponentType componentType = (ComponentType) propertyType;
-                for (String subPropertyName : componentType.getPropertyNames()) {
-                    propertiesToCheck.add(propertyName + "." + subPropertyName);
-                }
-            } else {
-                String[] subclassColumnNames = subclassPersister.getSubclassPropertyColumnNames(propertyName);
-                if (Arrays.deepEquals(columnNames, subclassColumnNames)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public String getMappedBy(EntityType<?> ownerType, String attributeName) {
-        CollectionPersister persister = getCollectionPersister(ownerType, attributeName);
-        if (persister != null) {
-            if (persister.isInverse()) {
-                return getMappedBy(persister);
-            } else if (persister instanceof OneToManyPersister) {
-                // A one-to-many association without a join table is like an inverse association
-                return "";
-            }
-        } else {
-            AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-            Type propertyType = getPropertyType(entityPersister, attributeName);
-            if (propertyType instanceof OneToOneType) {
-                return ((OneToOneType) propertyType).getRHSUniqueKeyPropertyName();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Map<String, String> getWritableMappedByMappings(EntityType<?> inverseType, EntityType<?> ownerType, String attributeName, String inverseAttribute) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        int propertyIndex = entityPersister.getEntityMetamodel().getPropertyIndex(attributeName);
-        Type propertyType = entityPersister.getPropertyTypes()[propertyIndex];
-        org.hibernate.type.EntityType ownerPropertyType;
-        if (propertyType instanceof CollectionType) {
-            QueryableCollection persister = getCollectionPersister(ownerType, attributeName);
-            AbstractEntityPersister inversePersister = getEntityPersister(inverseType);
-            if (!persister.isInverse() && persister.getTableName().equals(inversePersister.getTableName())) {
-                // We have a one-to-many relationship that has just join columns
-
-                // Find properties for element columns in entityPersister
-                // Map to properties for key columns of inverseType
-                Set<String> elementAttributes = getColumnMatchingAttributeNames(entityPersister, Arrays.asList((entityPersister.toColumns(attributeName))));
-                Set<String> keyAttributes = removeIdentifierAccess(ownerType, elementAttributes, inverseType, getColumnMatchingAttributeNames(inversePersister, Arrays.asList(persister.getKeyColumnNames())));
-
-                Map<String, String> mapping = new LinkedHashMap<>();
-                Iterator<String> elemAttrIter = elementAttributes.iterator();
-                Iterator<String> keyAttrIter = keyAttributes.iterator();
-
-                while (elemAttrIter.hasNext()) {
-                    mapping.put(elemAttrIter.next(), keyAttrIter.next());
-                }
-
-                if (mapping.isEmpty()) {
-                    throw new IllegalArgumentException("Mapped by property '" + inverseType.getName() + "#" + attributeName + "' must be writable or the column must be part of the id!");
-                }
-                return mapping;
-            } else {
-                // We only support detection when the inverse collection is writable
-                if (entityPersister.getEntityMetamodel().getPropertyInsertability()[propertyIndex]) {
-                    return null;
-                }
-                throw new IllegalArgumentException("Mapped by property '" + inverseType.getName() + "#" + attributeName + "' must be writable!");
-            }
-        } else {
-            // Either the mapped by property is writable
-            if (entityPersister.getEntityMetamodel().getPropertyInsertability()[propertyIndex]) {
-                return null;
-            }
-            // Or the columns of the mapped by property are part of the target id
-            ownerPropertyType = (org.hibernate.type.EntityType) propertyType;
-        }
-        AbstractEntityPersister sourceType = (AbstractEntityPersister) entityPersisters.get(ownerPropertyType.getAssociatedEntityName());
-        Type identifierType = ownerPropertyType.getIdentifierOrUniqueKeyType(entityPersister.getFactory());
-        String sourcePropertyPrefix;
-        String[] sourcePropertyNames;
-        if (identifierType.isComponentType()) {
-            ComponentType componentType = (ComponentType) identifierType;
-            sourcePropertyPrefix = sourceType.getIdentifierPropertyName() == null ? "" : sourceType.getIdentifierPropertyName() + ".";
-            sourcePropertyNames = componentType.getPropertyNames();
-        } else {
-            sourcePropertyPrefix = "";
-            sourcePropertyNames = new String[]{sourceType.getIdentifierPropertyName()};
-        }
-        String[] targetColumnNames = entityPersister.getPropertyColumnNames(propertyIndex);
-        Type targetIdType = entityPersister.getIdentifierType();
-        if (targetIdType.isComponentType()) {
-            ComponentType targetIdentifierType = (ComponentType) entityPersister.getIdentifierType();
-            String targetPropertyPrefix = entityPersister.getIdentifierPropertyName() == null ? "" : entityPersister.getIdentifierPropertyName() + ".";
-            String[] identifierColumnNames = entityPersister.getIdentifierColumnNames();
-            String[] targetIdentifierTypePropertyNames = targetIdentifierType.getPropertyNames();
-            Map<String, String> mapping = new LinkedHashMap<>();
-            for (int i = 0; i < targetColumnNames.length; i++) {
-                for (int j = 0; j < identifierColumnNames.length; j++) {
-                    if (targetColumnNames[i].equals(identifierColumnNames[j])) {
-                        mapping.put(sourcePropertyPrefix + sourcePropertyNames[i], targetPropertyPrefix + targetIdentifierTypePropertyNames[j]);
-                        break;
-                    }
-                }
-            }
-            if (mapping.isEmpty()) {
-                throw new IllegalArgumentException("Mapped by property '" + inverseType.getName() + "#" + attributeName + "' must be writable or the column must be part of the id!");
-            }
-            return mapping;
-        } else {
-            String targetIdColumnName = entityPersister.getIdentifierColumnNames()[0];
-            if (!targetIdColumnName.equals(targetColumnNames[0])) {
-                throw new IllegalArgumentException("Mapped by property '" + inverseType.getName() + "#" + attributeName + "' must be writable or the column must be part of the id!");
-            }
-            Map<String, String> mapping = new LinkedHashMap<>();
-            mapping.put(sourcePropertyPrefix + sourcePropertyNames[0], entityPersister.getIdentifierPropertyName());
-            return mapping;
-        }
-    }
-
-    private Set<String> removeIdentifierAccess(EntityType<?> elementType, Set<String> elementAttributeNames, EntityType<?> ownerType, Set<String> columnMatchingAttributeNames) {
-        Set<String> set = new LinkedHashSet<>();
-        Iterator<String> iterator = elementAttributeNames.iterator();
-        AbstractEntityPersister elementPersister = getEntityPersister(elementType);
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        List<String> addedAttributeNames = new ArrayList<>();
-        for (String attributeName : columnMatchingAttributeNames) {
-            String elementAttributeName = iterator.next();
-            Type propertyType = getPropertyType(entityPersister, attributeName);
-            if (propertyType instanceof org.hibernate.type.EntityType) {
-                // If the columns refer to an association, we map that through instead of trying to set just the identifier properties
-                if (elementPersister.getEntityName().equals(((org.hibernate.type.EntityType) propertyType).getAssociatedEntityName())) {
-                    int identifierCount = getJoinMappingPropertyNames(ownerType, null, attributeName).size();
-                    iterator.remove();
-                    for (int i = 1; i < identifierCount; i++) {
-                        iterator.next();
-                        iterator.remove();
-                    }
-                    addedAttributeNames.add(attributeName);
-                }
-            } else {
-                set.add(attributeName);
-            }
-        }
-
-        for (String addedAttributeName : addedAttributeNames) {
-            set.add(addedAttributeName);
-            elementAttributeNames.add("");
-        }
-
-        return set;
-    }
-
-    protected String getMappedBy(CollectionPersister persister) {
-        if (persister instanceof CustomCollectionPersister) {
-            return ((CustomCollectionPersister) persister).getMappedByProperty();
-        }
-
-        throw new IllegalStateException("Custom persister configured that doesn't implement the CustomCollectionPersister interface: " + persister);
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> entityType, String attributeName) {
-        QueryableCollection collectionPersister = getCollectionPersister(entityType, attributeName);
-        if (collectionPersister == null) {
-            return getColumnNames(getEntityPersister(entityType), attributeName);
-        } else {
-            return collectionPersister.getElementColumnNames();
-        }
-    }
-
-    public String[] getColumnNames(AbstractEntityPersister entityPersister, String attributeName) {
-        try {
-            return entityPersister.getPropertyColumnNames(attributeName);
-        } catch (MappingException e) {
-            // Workaround for HHH-15051
-            int dotIndex = attributeName.lastIndexOf('.');
-            if (dotIndex != -1) {
-                String attributePrefix = attributeName.substring(0, dotIndex);
-                Type propertyType = getPropertyType(entityPersister, attributePrefix);
-                if (propertyType instanceof org.hibernate.type.EntityType) {
-                    String[] columnNames = getColumnNames(entityPersister, attributePrefix);
-                    org.hibernate.type.EntityType hibernateEntityType = (org.hibernate.type.EntityType) propertyType;
-                    Type idType = hibernateEntityType.getIdentifierOrUniqueKeyType(entityPersister.getFactory());
-                    String attributeSubName = attributeName.substring(dotIndex + 1);
-                    if (idType instanceof CompositeType && ((CompositeType) idType).isEmbedded()) {
-                        CompositeType idClassType = (CompositeType) idType;
-                        int columnSpan = 0;
-                        int propertyIndex = -1;
-                        String[] propertyNames = idClassType.getPropertyNames();
-                        Type[] subtypes = idClassType.getSubtypes();
-                        for (int i = 0; i < propertyNames.length; i++) {
-                            if (propertyNames[i].equals(attributeSubName)) {
-                                propertyIndex = i;
-                                break;
-                            }
-                            columnSpan += subtypes[i].getColumnSpan(entityPersister.getFactory());
-                        }
-
-                        if (propertyIndex != -1) {
-                            String[] actualColumns = new String[subtypes[propertyIndex].getColumnSpan(entityPersister.getFactory())];
-                            System.arraycopy(columnNames, columnSpan, actualColumns, 0, actualColumns.length);
-                            return actualColumns;
-                        }
-                    } else if (attributeSubName.equals(hibernateEntityType.getIdentifierOrUniqueKeyPropertyName(entityPersister.getFactory()))) {
-                        return columnNames;
-                    }
-                }
-            }
-            throw new RuntimeException("Unknown property [" + attributeName + "] of entity [" + entityPersister.getEntityName() + "]", e);
-        }
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        QueryableCollection persister = getCollectionPersister(ownerType, elementCollectionPath);
-        String subAttributeName = attributeName.substring(elementCollectionPath.length() + 1);
-        if (persister.getElementType() instanceof ComponentType) {
-            ComponentType elementType = (ComponentType) persister.getElementType();
-            String[] propertyNames = elementType.getPropertyNames();
-            Type[] subtypes = elementType.getSubtypes();
-            String[] propertyParts = subAttributeName.split("\\.");
-            int offset = 0;
-            for (int j = 0; j < propertyParts.length - 1; j++) {
-                String propertyName = propertyParts[j];
-
-                for (int i = 0; i < propertyNames.length; i++) {
-                    int span = subtypes[i].getColumnSpan(persister.getFactory());
-                    if (propertyName.equals(propertyNames[i])) {
-                        if (subtypes[i] instanceof ComponentType) {
-                            elementType = (ComponentType) subtypes[i];
-                            propertyNames = elementType.getPropertyNames();
-                            subtypes = elementType.getSubtypes();
-                            break;
-                        } else {
-                            String[] columnNames = new String[span];
-                            String[] elementColumnNames = persister.getElementColumnNames();
-                            System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                            return columnNames;
-                        }
-                    } else {
-                        offset += span;
-                    }
-                }
-            }
-
-            String propertyName = propertyParts[propertyParts.length - 1];
-            for (int i = 0; i < propertyNames.length; i++) {
-                int span = subtypes[i].getColumnSpan(persister.getFactory());
-                if (propertyName.equals(propertyNames[i])) {
-                    String[] columnNames = new String[span];
-                    String[] elementColumnNames = persister.getElementColumnNames();
-                    System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                    return columnNames;
-                } else {
-                    offset += span;
-                }
-            }
-        } else if (persister.getElementType() instanceof org.hibernate.type.EntityType) {
-            AbstractEntityPersister elementPersister = (AbstractEntityPersister) entityPersisters.get(((org.hibernate.type.EntityType) persister.getElementType()).getAssociatedEntityName());
-            Type identifierType = ((org.hibernate.type.EntityType) persister.getElementType()).getIdentifierOrUniqueKeyType(persister.getFactory());
-            String identifierOrUniqueKeyPropertyName = ((org.hibernate.type.EntityType) persister.getElementType()).getIdentifierOrUniqueKeyPropertyName(persister.getFactory());
-            String prefix;
-            if (identifierType instanceof EmbeddedComponentType) {
-                String[] propertyNames = ((EmbeddedComponentType) identifierType).getPropertyNames();
-                String[] columnNames = columnNamesByPropertyName(elementPersister, propertyNames, subAttributeName, "", persister.getElementColumnNames(), persister.getFactory());
-                if (columnNames != null) {
-                    return columnNames;
-                }
-            } else if (subAttributeName.equals(identifierOrUniqueKeyPropertyName)) {
-                return persister.getElementColumnNames();
-            } else if (identifierType instanceof ComponentType && subAttributeName.startsWith(prefix = identifierOrUniqueKeyPropertyName + ".")) {
-                String[] propertyNames = ((ComponentType) identifierType).getPropertyNames();
-                String[] columnNames = columnNamesByPropertyName(elementPersister, propertyNames, subAttributeName.substring(identifierOrUniqueKeyPropertyName.length() + 1), prefix, persister.getElementColumnNames(), persister.getFactory());
-                if (columnNames != null) {
-                    return columnNames;
-                }
-            }
-        }
-
-        throw new IllegalArgumentException("Couldn't find column names for " + getTypeName(ownerType) + "#" + attributeName);
-    }
-
-    private String[] columnNamesByPropertyName(AbstractEntityPersister persister, String[] propertyNames, String subAttributeName, String prefix, String[] elementColumnNames, Mapping factory) {
-        int offset = 0;
-        for (int i = 0; i < propertyNames.length; i++) {
-            String propertyName = propertyNames[i];
-            Type propertyType = getPropertyType(persister, prefix + propertyName);
-            int span = propertyType.getColumnSpan(factory);
-            if (subAttributeName.equals(propertyName)) {
-                String[] columnNames = new String[span];
-                System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                return columnNames;
-            } else {
-                offset += span;
-            }
-        }
-
-        return null;
-    }
-
-    private String unquote(String name) {
-        if (useQuoted || name == null || name.length() < 2) {
-            return name;
-        }
-        final char first = name.charAt(0);
-        final char last = name.charAt(name.length() - 1);
-        if (first == '`' && last == '`'
-                || first == '[' && last == ']'
-                || first == '"' && last == '"') {
-            return name.substring(1, name.length() - 1);
-        }
-        return name;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> entityType, String attributeName) {
-        QueryableCollection collectionPersister = getCollectionPersister(entityType, attributeName);
-        if (collectionPersister == null) {
-            AbstractEntityPersister entityPersister = getEntityPersister(entityType);
-            SessionFactoryImplementor sfi = entityPersister.getFactory();
-            String[] columnNames = getColumnNames(entityPersister, attributeName);
-            Database database = sfi.getServiceRegistry().locateServiceBinding(Database.class).getService();
-            Table[] tables;
-
-            if (entityPersister instanceof JoinedSubclassEntityPersister) {
-                tables = new Table[((JoinedSubclassEntityPersister) entityPersister).getSubclassTableSpan()];
-                for (int i = 0; i < tables.length; i++) {
-                    tables[i] = getTable(database, entityPersister.getSubclassTableName(i));
-                }
-            } else if (entityPersister instanceof UnionSubclassEntityPersister) {
-                tables = new Table[((UnionSubclassEntityPersister) entityPersister).getSubclassTableSpan()];
-                for (int i = 0; i < tables.length; i++) {
-                    tables[i] = getTable(database, entityPersister.getSubclassTableName(i));
-                }
-            } else if (entityPersister instanceof SingleTableEntityPersister) {
-                tables = new Table[((SingleTableEntityPersister) entityPersister).getSubclassTableSpan()];
-                for (int i = 0; i < tables.length; i++) {
-                    tables[i] = getTable(database, entityPersister.getSubclassTableName(i));
-                }
-            } else {
-                tables = new Table[]{ getTable(database, entityPersister.getTableName()) };
-            }
-
-            boolean isSubselect = tables.length == 1 && tables[0] == null;
-
-            if (isSubselect || isFormula(columnNames)) {
-                Type propertyType = getPropertyType(entityPersister, attributeName);
-                return getColumnTypeForPropertyType(entityType, attributeName, sfi, propertyType);
-            }
-
-            return getColumnTypesForColumnNames(entityType, columnNames, tables);
-        } else {
-            SessionFactoryImplementor sfi = collectionPersister.getFactory();
-            return getColumnTypeForPropertyType(entityType, attributeName, sfi, collectionPersister.getElementType());
-        }
-    }
-
-    private String[] getColumnTypesForColumnNames(EntityType<?> entityType, String[] columnNames, Table[] tables) {
-        String[] columnTypes = new String[columnNames.length];
-        for (int i = 0; i < columnNames.length; i++) {
-            Column column = null;
-            for (int j = 0; j < tables.length; j++) {
-                column = tables[j].getColumn(new Column(columnNames[i]));
-                if (column != null) {
-                    break;
-                }
-            }
-
-            if (column == null) {
-                throw new IllegalArgumentException("Could not find column '" + columnNames[i] + "' in entity: " + entityType.getName());
-            }
-
-            columnTypes[i] = column.getSqlType();
-        }
-
-        return columnTypes;
-    }
-
-    private String[] getColumnTypeForPropertyType(EntityType<?> entityType, String attributeName, SessionFactoryImplementor sfi, Type propertyType) {
-        if (propertyType instanceof org.hibernate.type.EntityType) {
-            propertyType = ((org.hibernate.type.EntityType) propertyType).getIdentifierOrUniqueKeyType(sfi);
-        }
-
-        long length =   Column.DEFAULT_LENGTH;
-        int precision = Column.DEFAULT_PRECISION;
-        int scale =     Column.DEFAULT_SCALE;
-
-        try {
-            Method m = Type.class.getMethod("dictatedSizes", Mapping.class);
-            Object size = ((Object[]) m.invoke(propertyType, sfi))[0];
-            length =    (long) size.getClass().getMethod("getLength").invoke(size);
-            precision = (int)  size.getClass().getMethod("getPrecision").invoke(size);
-            scale =     (int)  size.getClass().getMethod("getScale").invoke(size);
-        } catch (Exception ex) {
-            LOG.fine("Could not determine the column type of the attribute: " + attributeName + " of the entity: " + entityType.getName());
-        }
-
-        return new String[] {
-                sfi.getDialect().getTypeName(
-                        propertyType.sqlTypes(sfi)[0],
-                        length,
-                        precision,
-                        scale
-                )
-        };
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        QueryableCollection persister = getCollectionPersister(ownerType, elementCollectionPath);
-        SessionFactoryImplementor sfi = persister.getFactory();
-        String[] columnNames = null;
-        Type propertyType = null;
-        String subAttributeName = attributeName.substring(elementCollectionPath.length() + 1);
-        if (persister.getElementType() instanceof ComponentType) {
-            ComponentType elementType = (ComponentType) persister.getElementType();
-            String[] propertyNames = elementType.getPropertyNames();
-            Type[] subtypes = elementType.getSubtypes();
-            String[] propertyParts = subAttributeName.split("\\.");
-            int offset = 0;
-            for (int j = 0; j < propertyParts.length - 1; j++) {
-                String propertyName = propertyParts[j];
-
-                for (int i = 0; i < propertyNames.length; i++) {
-                    int span = subtypes[i].getColumnSpan(persister.getFactory());
-                    if (propertyName.equals(propertyNames[i])) {
-                        if (subtypes[i] instanceof ComponentType) {
-                            elementType = (ComponentType) subtypes[i];
-                            propertyNames = elementType.getPropertyNames();
-                            subtypes = elementType.getSubtypes();
-                            break;
-                        } else {
-                            columnNames = new String[span];
-                            String[] elementColumnNames = persister.getElementColumnNames();
-                            System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                            break;
-                        }
-                    } else {
-                        offset += span;
-                    }
-                }
-            }
-
-            if (columnNames == null) {
-                String propertyName = propertyParts[propertyParts.length - 1];
-                for (int i = 0; i < propertyNames.length; i++) {
-                    int span = subtypes[i].getColumnSpan(persister.getFactory());
-                    if (propertyName.equals(propertyNames[i])) {
-                        columnNames = new String[span];
-                        String[] elementColumnNames = persister.getElementColumnNames();
-                        System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                        break;
-                    } else {
-                        offset += span;
-                    }
-                }
-            }
-        } else if (persister.getElementType() instanceof org.hibernate.type.EntityType) {
-            Type identifierType = ((org.hibernate.type.EntityType) persister.getElementType()).getIdentifierOrUniqueKeyType(persister.getFactory());
-            String identifierOrUniqueKeyPropertyName = ((org.hibernate.type.EntityType) persister.getElementType()).getIdentifierOrUniqueKeyPropertyName(persister.getFactory());
-            String prefix;
-            if (identifierType instanceof EmbeddedComponentType) {
-                String[] propertyNames = ((EmbeddedComponentType) identifierType).getPropertyNames();
-                Type[] subtypes = ((EmbeddedComponentType) identifierType).getSubtypes();
-                int offset = 0;
-                for (int i = 0; i < propertyNames.length; i++) {
-                    String propertyName = propertyNames[i];
-                    int span = subtypes[i].getColumnSpan(persister.getFactory());
-                    if (subAttributeName.equals(propertyName)) {
-                        columnNames = new String[span];
-                        String[] elementColumnNames = persister.getElementColumnNames();
-                        System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                        propertyType = subtypes[i];
-                        break;
-                    } else {
-                        offset += span;
-                    }
-                }
-            } else if (subAttributeName.equals(identifierOrUniqueKeyPropertyName)) {
-                columnNames = persister.getElementColumnNames();
-                propertyType = identifierType;
-            } else if (identifierType instanceof ComponentType && subAttributeName.startsWith(prefix = identifierOrUniqueKeyPropertyName + ".")) {
-                String[] propertyNames = ((ComponentType) identifierType).getPropertyNames();
-                Type[] subtypes = ((ComponentType) identifierType).getSubtypes();
-                String subPropertyName = subAttributeName.substring(prefix.length());
-                int offset = 0;
-                for (int i = 0; i < propertyNames.length; i++) {
-                    String propertyName = propertyNames[i];
-                    int span = subtypes[i].getColumnSpan(persister.getFactory());
-                    if (subPropertyName.equals(propertyName)) {
-                        columnNames = new String[span];
-                        String[] elementColumnNames = persister.getElementColumnNames();
-                        System.arraycopy(elementColumnNames, offset, columnNames, 0, span);
-                        propertyType = subtypes[i];
-                        break;
-                    } else {
-                        offset += span;
-                    }
-                }
-            }
-        }
-
-        if (columnNames == null) {
-            throw new IllegalArgumentException("Couldn't find column names for " + getTypeName(ownerType) + "#" + attributeName);
-        }
-
-        if (isFormula(columnNames)) {
-            return getColumnTypeForPropertyType(ownerType, attributeName, sfi, propertyType);
-        }
-
-        Database database = sfi.getServiceRegistry().locateServiceBinding(Database.class).getService();
-        Table[] tables = new Table[]{ getTable(database, persister.getTableName()) };
-
-        return getColumnTypesForColumnNames(ownerType, columnNames, tables);
-    }
-
-    private Table getTable(Database database, String tableName) {
-        Table table = database.getTable(unquote(tableName));
-
-        if (table == null) {
-            // It might happen that the boot model does not consider the schema so we skip it here
-            table = database.getTable(unquote(tableName.substring(tableName.lastIndexOf('.') + 1)));
-        }
-        return table;
-    }
-
-    private boolean isFormula(String[] columnNames) {
-        for (int i = 0; i < columnNames.length; i++) {
-            if (columnNames[i] == null) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
-        CollectionPersister persister = getCollectionPersister(ownerType, attributeName);
-        if (persister instanceof QueryableCollection) {
-            QueryableCollection queryableCollection = (QueryableCollection) persister;
-
-            if (!queryableCollection.getElementType().isEntityType()) {
-                String[] targetColumnMetaData = queryableCollection.getElementColumnNames();
-                Map<String, String> targetColumnMapping = new LinkedHashMap<>();
-
-                for (int i = 0; i < targetColumnMetaData.length; i++) {
-                    targetColumnMapping.put(targetColumnMetaData[i], targetColumnMetaData[i]);
-                }
-                return createJoinTable(ownerType, queryableCollection, targetColumnMapping, null, attributeName);
-            } else if (queryableCollection.getElementPersister() instanceof Joinable) {
-                String elementTableName = ((Joinable) queryableCollection.getElementPersister()).getTableName();
-                if (!queryableCollection.getTableName().equals(elementTableName)) {
-                    String[] targetColumnMetaData = queryableCollection.getElementColumnNames();
-                    AbstractEntityPersister elementPersister = (AbstractEntityPersister) queryableCollection.getElementPersister();
-                    String identifierOrUniqueKeyPropertyName = ((ManyToOneType) persister.getElementType()).getIdentifierOrUniqueKeyPropertyName(persister.getFactory());
-                    String[] targetPrimaryKeyColumnMetaData = identifierOrUniqueKeyPropertyName == null ?
-                            elementPersister.getKeyColumnNames() : // IdClass returns null for getIdentifierOrUniqueKeyPropertyName
-                            getColumnNames(elementPersister, identifierOrUniqueKeyPropertyName);
-
-                    Map<String, String> targetIdColumnMapping = new LinkedHashMap<>();
-
-                    for (int i = 0; i < targetColumnMetaData.length; i++) {
-                        targetIdColumnMapping.put(targetColumnMetaData[i], targetPrimaryKeyColumnMetaData[i]);
-                    }
-                    Set<String> idAttributeNames = getColumnMatchingAttributeNames(elementPersister, Arrays.asList(targetPrimaryKeyColumnMetaData));
-                    return createJoinTable(ownerType, queryableCollection, targetIdColumnMapping, idAttributeNames, attributeName);
-                }
-            }
-        }
-        return null;
-    }
-
-    private JoinTable createJoinTable(EntityType<?> ownerType, QueryableCollection queryableCollection, Map<String, String> targetColumnMapping, Set<String> targetIdAttributeNames, String attributeName) {
-        String[] indexColumnNames = queryableCollection.getIndexColumnNames();
-        Map<String, String> keyColumnMapping = null;
-        Map<String, String> keyColumnTypes = null;
-        if (indexColumnNames != null) {
-            keyColumnMapping = new LinkedHashMap<>(indexColumnNames.length);
-            keyColumnTypes = new LinkedHashMap<>(indexColumnNames.length);
-            if (queryableCollection.getKeyType().isEntityType()) {
-                throw new IllegalArgumentException("Determining the join table key foreign key mappings is not yet supported!");
-            } else {
-                keyColumnMapping.put(indexColumnNames[0], indexColumnNames[0]);
-                keyColumnTypes.put(indexColumnNames[0], getColumnTypeForPropertyType(ownerType, attributeName, queryableCollection.getFactory(), queryableCollection.getIndexType())[0]);
-            }
-        }
-        AbstractEntityPersister ownerEntityPersister = (AbstractEntityPersister) queryableCollection.getOwnerEntityPersister();
-        String[] primaryKeyColumnMetaData;
-        if (queryableCollection.getKeyType() instanceof EmbeddedComponentType) {
-            String[] propertyNames = ((EmbeddedComponentType) queryableCollection.getKeyType()).getPropertyNames();
-            List<String> columnNames = new ArrayList<>(propertyNames.length);
-            for (String propertyName : propertyNames) {
-                for (String propertyColumnName : getColumnNames(ownerEntityPersister, propertyName)) {
-                    columnNames.add(propertyColumnName);
-                }
-            }
-
-            primaryKeyColumnMetaData = columnNames.toArray(new String[columnNames.size()]);
-        } else {
-            primaryKeyColumnMetaData = ownerEntityPersister.getKeyColumnNames();
-        }
-        String[] foreignKeyColumnMetaData = queryableCollection.getKeyColumnNames();
-        Map<String, String> idColumnMapping = new LinkedHashMap<>(primaryKeyColumnMetaData.length);
-        for (int i = 0; i < foreignKeyColumnMetaData.length; i++) {
-            idColumnMapping.put(foreignKeyColumnMetaData[i], primaryKeyColumnMetaData[i]);
-        }
-        Set<String> idAttributeNames = getColumnMatchingAttributeNames(ownerEntityPersister, Arrays.asList(primaryKeyColumnMetaData));
-        if (targetIdAttributeNames == null) {
-            Type elementType = queryableCollection.getElementType();
-            if (elementType instanceof ComponentType) {
-                targetIdAttributeNames = new LinkedHashSet<>();
-                collectPropertyNames(targetIdAttributeNames, null, elementType, queryableCollection.getFactory());
-            }
-        }
-
-        return new JoinTable(
-                queryableCollection.getTableName(),
-                idAttributeNames,
-                idColumnMapping,
-                keyColumnMapping,
-                keyColumnTypes,
-                targetIdAttributeNames,
-                targetColumnMapping
-        );
-    }
-
-    private static Set<String> getColumnMatchingAttributeNames(AbstractEntityPersister ownerEntityPersister, List<String> idColumnNames) {
-        Set<String> idAttributeNames = new LinkedHashSet<>();
-        Type identifierType = ownerEntityPersister.getIdentifierType();
-        if (identifierType instanceof ComponentType) {
-            String[] idPropertyNames = ((ComponentType) identifierType).getPropertyNames();
-            for (String propertyName : idPropertyNames) {
-                String attributeName = ownerEntityPersister.getIdentifierPropertyName() == null ? "" : ownerEntityPersister.getIdentifierPropertyName() + "." + propertyName;
-                String[] propertyColumnNames = ownerEntityPersister.getSubclassPropertyColumnNames(attributeName);
-                if (propertyColumnNames != null) {
-                    for (int j = 0; j < propertyColumnNames.length; j++) {
-                        String propertyColumnName = propertyColumnNames[j];
-                        if (idColumnNames.contains(propertyColumnName)) {
-                            idAttributeNames.add(attributeName);
-                            break;
-                        }
-                    }
-                }
-            }
-            // We assume that when a primary identifier attribute is part of the id column names, that we are done
-            if (!idAttributeNames.isEmpty()) {
-                return idAttributeNames;
-            }
-        } else {
-            for (String identifierColumnName : ownerEntityPersister.getIdentifierColumnNames()) {
-                if (idColumnNames.contains(identifierColumnName)) {
-                    idAttributeNames.add(ownerEntityPersister.getIdentifierPropertyName());
-                    return idAttributeNames;
-                }
-            }
-        }
-        String[] propertyNames = ownerEntityPersister.getPropertyNames();
-        for (int i = 0; i < propertyNames.length; i++) {
-            String propertyName = propertyNames[i];
-            String[] propertyColumnNames = ownerEntityPersister.getSubclassPropertyColumnNames(propertyName);
-            if (propertyColumnNames != null) {
-                for (int j = 0; j < propertyColumnNames.length; j++) {
-                    String propertyColumnName = propertyColumnNames[j];
-                    if (idColumnNames.contains(propertyColumnName)) {
-                        idAttributeNames.add(propertyName);
-                        break;
-                    }
-                }
-            }
-        }
-        return idAttributeNames;
-    }
-
-    @Override
-    public boolean isBag(EntityType<?> ownerType, String attributeName) {
-        CollectionPersister persister = null;
-        IdentifiableType<?> type = ownerType;
-        String typeName = getTypeName(ownerType);
-        StringBuilder sb = new StringBuilder(typeName.length() + attributeName.length() + 1);
-        while (persister == null && type != null) {
-            sb.setLength(0);
-            sb.append(getTypeName(type));
-            sb.append('.');
-            sb.append(attributeName);
-            persister = collectionPersisters.get(sb.toString());
-            type = type.getSupertype();
-        }
-
-        return persister != null && !persister.hasIndex() && !persister.isInverse() && !(getAttribute(ownerType, attributeName) instanceof SetAttribute<?, ?>);
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        if (entityPersister != null) {
-            EntityMetamodel entityMetamodel = entityPersister.getEntityMetamodel();
-            Integer index = entityMetamodel.getPropertyIndexOrNull(attributeName);
-            if (index != null) {
-                return entityMetamodel.getCascadeStyles()[index].hasOrphanDelete();
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        Type elementType = getCollectionPersister(ownerType, elementCollectionPath).getElementType();
-        if (!(elementType instanceof ComponentType)) {
-            // This can only happen for collection/join table target attributes, where it is irrelevant
-            return false;
-        }
-        ComponentType componentType = (ComponentType) elementType;
-        String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-        // Component types only store direct properties, so we have to go deeper
-        String[] propertyParts = subAttribute.split("\\.");
-        int propertyIndex = 0;
-        for (; propertyIndex < propertyParts.length - 1; propertyIndex++) {
-            int index = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            Type propertyType = componentType.getSubtypes()[index];
-            if (propertyType instanceof ComponentType) {
-                componentType = (ComponentType) propertyType;
-            } else {
-                // The association property is just as good as the id property of the association for our purposes
-                // So we stop here and query the association property instead
-                break;
-            }
-        }
-        int leafPropertyIndex = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-        return componentType.getCascadeStyle(leafPropertyIndex).hasOrphanDelete();
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-        if (entityPersister != null) {
-            EntityMetamodel entityMetamodel = entityPersister.getEntityMetamodel();
-            Integer index = entityMetamodel.getPropertyIndexOrNull(attributeName);
-            if (index != null) {
-                return entityMetamodel.getCascadeStyles()[index].doCascade(CascadingAction.DELETE);
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        Type elementType = getCollectionPersister(ownerType, elementCollectionPath).getElementType();
-        if (!(elementType instanceof ComponentType)) {
-            // This can only happen for collection/join table target attributes, where it is irrelevant
-            return false;
-        }
-        ComponentType componentType = (ComponentType) elementType;
-        String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-        // Component types only store direct properties, so we have to go deeper
-        String[] propertyParts = subAttribute.split("\\.");
-        int propertyIndex = 0;
-        for (; propertyIndex < propertyParts.length - 1; propertyIndex++) {
-            int index = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-            Type propertyType = componentType.getSubtypes()[index];
-            if (propertyType instanceof ComponentType) {
-                componentType = (ComponentType) propertyType;
-            } else {
-                // The association property is just as good as the id property of the association for our purposes
-                // So we stop here and query the association property instead
-                break;
-            }
-        }
-        int leafPropertyIndex = componentType.getPropertyIndex(propertyParts[propertyIndex]);
-        return componentType.getCascadeStyle(leafPropertyIndex).doCascade(CascadingAction.DELETE);
-    }
-
-    @Override
-    public boolean hasJoinCondition(ManagedType<?> owner, String elementCollectionPath, String attributeName) {
-        QueryableCollection persister;
-        Type propertyType;
-        AbstractEntityPersister entityPersister = getEntityPersister(owner);
-        if (entityPersister == null) {
-            return false;
-        }
-        SessionFactoryImplementor factory = entityPersister.getFactory();
-        if (elementCollectionPath != null && (persister = getCollectionPersister(owner, elementCollectionPath)) != null) {
-            Type elementType = persister.getElementType();
-            if (!(elementType instanceof ComponentType)) {
-                // This can only happen for collection/join table target attributes, where it is irrelevant
-                return false;
-            }
-            ComponentType componentType = (ComponentType) elementType;
-            String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-            // Component types only store direct properties, so we have to go deeper
-            String[] propertyParts = subAttribute.split("\\.");
-            for (int i = 0; i < propertyParts.length - 1; i++) {
-                int index = componentType.getPropertyIndex(propertyParts[i]);
-                propertyType = componentType.getSubtypes()[index];
-                if (propertyType instanceof ComponentType) {
-                    componentType = (ComponentType) propertyType;
-                } else {
-                    // This can only happen for collection/join table target attributes, where it is irrelevant
-                    return false;
-                }
-            }
-
-            propertyType = componentType.getSubtypes()[componentType.getPropertyIndex(propertyParts[propertyParts.length - 1])];
-        } else {
-            propertyType = getPropertyType(entityPersister, attributeName);
-        }
-
-        if (propertyType instanceof CollectionType) {
-            return ((QueryableCollection) collectionPersisters.get(((CollectionType) propertyType).getRole())).hasWhere();
-        } else {
-            if (propertyType instanceof org.hibernate.type.EntityType) {
-                AbstractEntityPersister elementPersister = (AbstractEntityPersister) entityPersisters.get(((org.hibernate.type.EntityType) propertyType).getAssociatedEntityName());
-                String filterFragment = elementPersister.filterFragment("x", Collections.emptyMap());
-                if (elementPersister instanceof SingleTableEntityPersister) {
-                    String discriminatorColumnName;
-                    if (!filterFragment.isEmpty() && (discriminatorColumnName = elementPersister.getDiscriminatorColumnName()) != null) {
-                        InFragment frag = new InFragment();
-                        frag.setColumn("x", discriminatorColumnName);
-
-                        String[] subclasses = ((SingleTableEntityPersister) elementPersister).getSubclassClosure();
-                        for (int i = 0; i < subclasses.length; i++) {
-                            final Queryable queryable = (Queryable) factory.getEntityPersister(subclasses[i]);
-                            if (!queryable.isAbstract()) {
-                                frag.addValue(queryable.getDiscriminatorSQLValue());
-                            }
-                        }
-
-                        String fragmentString = frag.toFragmentString();
-                        StringBuilder buf = new StringBuilder(fragmentString.length() + 5)
-                                .append(" and ")
-                                .append(fragmentString);
-
-                        return !filterFragment.startsWith(buf.toString()) || filterFragment.length() > buf.length();
-                    }
-                } else {
-                    return !filterFragment.isEmpty();
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private Type getPropertyType(AbstractEntityPersister entityPersister, String attributeName) {
-        try {
-            return entityPersister.getPropertyType(attributeName);
-        } catch (QueryException ex) {
-            // Workaround for HHH-15051
-            int dotIndex = attributeName.lastIndexOf('.');
-            if (dotIndex != -1) {
-                Type propertyType = getPropertyType(entityPersister, attributeName.substring(0, dotIndex));
-                if (propertyType instanceof org.hibernate.type.EntityType) {
-                    org.hibernate.type.EntityType entityType = (org.hibernate.type.EntityType) propertyType;
-                    Type idType = entityType.getIdentifierOrUniqueKeyType(entityPersister.getFactory());
-                    String attributeSubName = attributeName.substring(dotIndex + 1);
-                    if (idType instanceof CompositeType && ((CompositeType) idType).isEmbedded()) {
-                        CompositeType idClassType = (CompositeType) idType;
-                        int propertyIndex = Arrays.asList(idClassType.getPropertyNames()).indexOf(attributeSubName);
-                        if (propertyIndex != -1) {
-                            return idClassType.getSubtypes()[propertyIndex];
-                        }
-                    } else if (attributeSubName.equals(entityType.getIdentifierOrUniqueKeyPropertyName(entityPersister.getFactory()))) {
-                        return idType;
-                    }
-                }
-            }
-            throw ex;
-        }
-    }
-
-    @Override
-    public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id) {
-        SessionImplementor session = em.unwrap(SessionImplementor.class);
-        EntityKey entityKey = session.generateEntityKey((Serializable) id, session.getFactory().getEntityPersister(entityClass.getName()));
-        PersistenceContext pc = session.getPersistenceContext();
-        return pc.getEntity(entityKey) != null || pc.getProxy(entityKey) != null;
-    }
-
-    private Attribute<?, ?> getAttribute(EntityType<?> ownerType, String attributeName) {
-        if (attributeName.indexOf('.') == -1) {
-            return ownerType.getAttribute(attributeName);
-        }
-        ManagedType<?> t = ownerType;
-        Attribute<?, ?> attr = null;
-        String[] parts = attributeName.split("\\.");
-        for (int i = 0; i < parts.length; i++) {
-            attr = t.getAttribute(parts[i]);
-            if (i + 1 != parts.length) {
-                if (attr instanceof SingularAttribute<?, ?>) {
-                    SingularAttribute<?, ?> singularAttribute = (SingularAttribute<?, ?>) attr;
-                    if (singularAttribute.getType().getPersistenceType() != javax.persistence.metamodel.Type.PersistenceType.BASIC) {
-                        t = (ManagedType<?>) singularAttribute.getType();
-                        continue;
-                    }
-                }
-
-                throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-            }
-        }
-
-        return attr;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationIdExpressions() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetEmbeddable() {
-        // Tried it, but the SQL generation seems to mess up...
-        return false;
-    }
-
-    @Override
-    public boolean supportsUpdateSetAssociationId() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTransientEntityAsParameter() {
-        return true;
-    }
-
-    @Override
-    public boolean needsTypeConstraintForColumnSharing() {
-        return true;
-    }
-
-    @Override
-    public void setCacheable(Query query) {
-        query.setHint("org.hibernate.cacheable", true);
-    }
-
-    @Override
-    public void setSingularParameter(Query query, String name, Object value) {
-        if (value instanceof Collection) {
-            org.hibernate.Query hibernateQuery = query.unwrap(org.hibernate.Query.class);
-            Type expectedType = null;
-            if (GET_PARAMETER_METADATA != null) {
-                // For Hibernate <= 5.1 we have to set the expected type
-                try {
-                    ParameterMetadata metadata = (ParameterMetadata) GET_PARAMETER_METADATA.invoke(hibernateQuery);
-                    expectedType = metadata.getNamedParameterExpectedType(name);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            hibernateQuery.setParameter(name, value, expectedType);
-        } else {
-            query.setParameter(name, value);
-        }
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> owner, String attributeName) {
-        return new ArrayList<>(getJoinMappingPropertyNames(owner, null, attributeName).keySet());
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        return new ArrayList<>(getJoinMappingPropertyNames(owner, elementCollectionPath, attributeName).keySet());
-    }
-
-    @Override
-    public Map<String, String> getJoinMappingPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        QueryableCollection persister;
-        Type propertyType;
-        AbstractEntityPersister entityPersister = getEntityPersister(owner);
-        SessionFactoryImplementor factory = entityPersister.getFactory();
-        if (elementCollectionPath != null && (persister = getCollectionPersister(owner, elementCollectionPath)) != null) {
-            ComponentType componentType = (ComponentType) persister.getElementType();
-            String subAttribute = attributeName.substring(elementCollectionPath.length() + 1);
-            // Component types only store direct properties, so we have to go deeper
-            String[] propertyParts = subAttribute.split("\\.");
-            for (int i = 0; i < propertyParts.length - 1; i++) {
-                int index = componentType.getPropertyIndex(propertyParts[i]);
-                propertyType = componentType.getSubtypes()[index];
-                if (propertyType instanceof ComponentType) {
-                    componentType = (ComponentType) propertyType;
-                } else {
-                    // A path expression shouldn't navigate over an association..
-                    throw new IllegalStateException("Can't get the id properties for: " + attributeName);
-                }
-            }
-
-            propertyType = componentType.getSubtypes()[componentType.getPropertyIndex(propertyParts[propertyParts.length - 1])];
-        } else {
-            propertyType = getPropertyType(entityPersister, attributeName);
-        }
-
-        List<String> identifierOrUniqueKeyPropertyNames = new ArrayList<>();
-        List<String> sourceIdentifierOrUniqueKeyPropertyNames = new ArrayList<>();
-
-        if (propertyType instanceof CollectionType) {
-            Type elementType = ((CollectionType) propertyType).getElementType(factory);
-            if (elementType instanceof org.hibernate.type.EntityType) {
-                JoinTable joinTable = getJoinTable(owner, attributeName);
-                Collection<String> targetAttributeNames = joinTable == null ? null : joinTable.getTargetAttributeNames();
-                if (targetAttributeNames == null) {
-                    collectPropertyNames(identifierOrUniqueKeyPropertyNames, null, elementType, factory);
-                    String mappedBy = getMappedBy(getCollectionPersister(owner, attributeName));
-                    if (mappedBy == null || mappedBy.isEmpty()) {
-                        // Not sure if this can happen. If we can't determine targetAttributeNames or don't have a join table
-                        // but also no mapped by attribute, I don't know if that is even a valid/possible mapping
-                        if (((CollectionType) propertyType).useLHSPrimaryKey()) {
-                            // TODO: this doesn't work for entities using an id class
-                            sourceIdentifierOrUniqueKeyPropertyNames.add(entityPersister.getIdentifierPropertyName());
-                        } else {
-                            throw new IllegalArgumentException("One-to-many using natural key is unsupported!");
-                        }
-                    } else {
-                        AbstractEntityPersister elementPersister = (AbstractEntityPersister) entityPersisters.get(((org.hibernate.type.EntityType) elementType).getAssociatedEntityName());
-                        collectPropertyNames(sourceIdentifierOrUniqueKeyPropertyNames, null, getPropertyType(elementPersister, mappedBy), factory);
-//                        if (sourceIdentifierOrUniqueKeyPropertyNames.size() != identifierOrUniqueKeyPropertyNames.size()) {
-//                            // We have a inverse map or inverse indexed list here
-//                            // Maybe at some point we can determine the index property name mapping as well
-//                            persister = getCollectionPersister(owner, attributeName);
-//                            Set<String> indexAttributeNames = getColumnMatchingAttributeNames(elementPersister, Arrays.asList(persister.getIndexColumnNames()));
-//                            persister.getIndexType()
-//                        }
-                    }
-                } else {
-                    AbstractEntityPersister elementPersister = (AbstractEntityPersister) entityPersisters.get(((org.hibernate.type.EntityType) elementType).getAssociatedEntityName());
-                    for (String targetAttributeName : targetAttributeNames) {
-                        collectPropertyNames(identifierOrUniqueKeyPropertyNames, targetAttributeName, getPropertyType(elementPersister, targetAttributeName), factory);
-                    }
-                    for (String idAttributeName : joinTable.getIdAttributeNames()) {
-                        collectPropertyNames(sourceIdentifierOrUniqueKeyPropertyNames, idAttributeName, getPropertyType(entityPersister, idAttributeName), factory);
-                    }
-                }
-            }
-        } else {
-            collectPropertyNames(identifierOrUniqueKeyPropertyNames, null, propertyType, factory);
-            if (propertyType instanceof org.hibernate.type.EntityType) {
-                AbstractEntityPersister elementPersister = (AbstractEntityPersister) entityPersisters.get(((org.hibernate.type.EntityType) propertyType).getAssociatedEntityName());
-                if (((org.hibernate.type.EntityType) propertyType).isReferenceToPrimaryKey()) {
-                    if (elementPersister.getIdentifierType().isComponentType()) {
-                        String targetPropertyPrefix = elementPersister.getIdentifierPropertyName() == null ? attributeName + "." : "";
-                        for (int i = 0; i < identifierOrUniqueKeyPropertyNames.size(); i++) {
-                            sourceIdentifierOrUniqueKeyPropertyNames.add(targetPropertyPrefix + identifierOrUniqueKeyPropertyNames.get(i));
-                        }
-                    } else {
-                        sourceIdentifierOrUniqueKeyPropertyNames.add(elementPersister.getIdentifierPropertyName());
-                    }
-                } else if (propertyType instanceof OneToOneType) {
-                    String mappedBy = ((OneToOneType) propertyType).getRHSUniqueKeyPropertyName();
-                    if (mappedBy == null || mappedBy.isEmpty()) {
-                        throw new IllegalArgumentException("One-to-one using natural key is unsupported!");
-                    } else {
-                        collectPropertyNames(sourceIdentifierOrUniqueKeyPropertyNames, null, getPropertyType(elementPersister, mappedBy), factory);
-                    }
-                }
-            }
-        }
-
-        Map<String, String> joinMapping = new LinkedHashMap<>(identifierOrUniqueKeyPropertyNames.size());
-        for (int i = 0; i < identifierOrUniqueKeyPropertyNames.size(); i++) {
-            if (sourceIdentifierOrUniqueKeyPropertyNames.size() > i) {
-                joinMapping.put(identifierOrUniqueKeyPropertyNames.get(i), sourceIdentifierOrUniqueKeyPropertyNames.get(i));
-            } else {
-                joinMapping.put(identifierOrUniqueKeyPropertyNames.get(i), null);
-            }
-        }
-
-        return joinMapping;
-    }
-
-    private void collectPropertyNames(Collection<String> propertyNames, String prefix, Type propertyType, Mapping factory) {
-        if (propertyType instanceof ComponentType) {
-            ComponentType componentType = (ComponentType) propertyType;
-            for (String propertyName : componentType.getPropertyNames()) {
-                Type subtype = componentType.getSubtypes()[componentType.getPropertyIndex(propertyName)];
-                collectPropertyNames(propertyNames, prefix == null ? propertyName : prefix + "." + propertyName, subtype, factory);
-            }
-        } else if (propertyType instanceof org.hibernate.type.EntityType) {
-            org.hibernate.type.EntityType entityType = (org.hibernate.type.EntityType) propertyType;
-            Type identifierOrUniqueKeyType = entityType.getIdentifierOrUniqueKeyType(factory);
-
-            if (identifierOrUniqueKeyType instanceof EmbeddedComponentType) {
-                EmbeddedComponentType embeddedComponentType = (EmbeddedComponentType) identifierOrUniqueKeyType;
-                for (String propertyName : embeddedComponentType.getPropertyNames()) {
-                    propertyNames.add(prefix == null ? propertyName : prefix + "." + propertyName);
-                }
-            } else {
-                String identifierOrUniqueKeyPropertyName = entityType.getIdentifierOrUniqueKeyPropertyName(factory);
-                collectPropertyNames(propertyNames, prefix == null ? identifierOrUniqueKeyPropertyName : prefix + "." + identifierOrUniqueKeyPropertyName, identifierOrUniqueKeyType, factory);
-            }
-        } else if (!(propertyType instanceof CollectionType) && prefix != null) {
-            propertyNames.add(prefix);
-        }
-    }
-
-    @Override
-    public boolean supportsEnumLiteral(ManagedType<?> ownerType, String attributeName, boolean key) {
-        if (ownerType instanceof EntityType<?>) {
-            AbstractEntityPersister entityPersister = getEntityPersister(ownerType);
-            Type propertyType;
-            propertyType = getPropertyType(entityPersister, attributeName);
-            if (propertyType instanceof CollectionType) {
-                CollectionPersister collectionPersister = entityPersister.getFactory().getCollectionPersister(((CollectionType) propertyType).getRole());
-                if (key) {
-                    propertyType = collectionPersister.getIndexType();
-                } else {
-                    propertyType = collectionPersister.getElementType();
-                }
-            }
-            if (propertyType instanceof CustomType) {
-                return ((CustomType) propertyType).getUserType() instanceof EnhancedUserType;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean supportsTemporalLiteral() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsNonDrivingAliasInOnClause() {
-        return supportsNonDrivingAliasInOnClause;
-    }
-
-    @Override
-    public boolean supportsSelectCompositeIdEntityInSubquery() {
-        // Not yet implemented in Hibernate, see https://hibernate.atlassian.net/browse/HHH-14156
-        return false;
-    }
-
-    @Override
-    public boolean supportsProxyParameterForNonPkAssociation() {
-        // Not yet implemented in Hibernate, see https://hibernate.atlassian.net/browse/HHH-14017
-        return false;
-    }
-
-    @Override
-    public boolean supportsProxyRemove() {
-        return false;
-    }
-
-    @Override
-    public void initialize(Object entity) {
-        Hibernate.initialize(entity);
-    }
-
-    @Override
-    public Object getIdentifier(Object entity) {
-        // Pre Hibernate 5.2, accessing the identifier through the PersistenceUnitUtil caused initialization of the proxy
-        if (entity instanceof HibernateProxy) {
-            return ((HibernateProxy) entity).getHibernateLazyInitializer().getIdentifier();
-        }
-        return persistenceUnitUtil.getIdentifier(entity);
-    }
-
-    @Override
-    public <T> T unproxy(T entity) {
-        if (entity instanceof HibernateProxy) {
-            HibernateProxy hibernateProxy = (HibernateProxy) entity;
-            LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer();
-            return (T) initializer.getImplementation();
-        } else {
-            return entity;
-        }
-    }
-
-    @Override
-    public JpaMetamodelAccessor getJpaMetamodelAccessor() {
-        return JpaMetamodelAccessorImpl.INSTANCE;
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateReturningResult.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateReturningResult.java
deleted file mode 100644
index 09fec0e927..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateReturningResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import com.blazebit.persistence.ReturningResult;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class HibernateReturningResult<T> implements ReturningResult<T> {
-
-    private List<T> resultList;
-    private int updateCount;
-
-    @Override
-    public T getLastResult() {
-        return resultList.get(resultList.size() - 1);
-    }
-
-    @Override
-    public List<T> getResultList() {
-        return resultList;
-    }
-    
-    public void setResultList(List<T> resultList) {
-        this.resultList = resultList;
-    }
-
-    @Override
-    public int getUpdateCount() {
-        return updateCount;
-    }
-    
-    public void setUpdateCount(int updateCount) {
-        this.updateCount = updateCount;
-    }
-    
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/MultiIterator.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/MultiIterator.java
deleted file mode 100644
index e52d706580..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/MultiIterator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class MultiIterator<T> implements Iterator<T> {
-
-    private final List<Iterator<T>> iterators;
-    private Iterator<T> current;
-    private int nextIndex;
-
-    public MultiIterator(List<Iterator<T>> iterators) {
-        this.iterators = iterators;
-        this.current = iterators.get(0);
-        this.nextIndex = 1;
-    }
-
-    @Override
-    public boolean hasNext() {
-        if (current != null && current.hasNext()) {
-            return true;
-        }
-        if (nextIndex >= iterators.size()) {
-            return false;
-        }
-
-        current = iterators.get(nextIndex);
-        nextIndex++;
-        return hasNext();
-    }
-
-    @Override
-    public T next() {
-        if (current != null && current.hasNext()) {
-            return current.next();
-        }
-        if (nextIndex >= iterators.size()) {
-            throw new NoSuchElementException();
-        }
-
-        current = iterators.get(nextIndex);
-        nextIndex++;
-        return next();
-    }
-
-    @Override
-    public void remove() {
-        if (current == null) {
-            throw new IllegalStateException();
-        }
-
-        current.remove();
-    }
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/QuoteMode.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/QuoteMode.java
deleted file mode 100644
index b91c575059..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/QuoteMode.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public enum QuoteMode {
-    NONE {
-        public QuoteMode onChar(char c) {
-            if (c == '\'') {
-                return SINGLE;
-            } else if (c == '\"') {
-                return DOUBLE;
-            } else if (c == '`') {
-                return BACKTICK;
-            } else if (c == '[') {
-                return BRACKET;
-            }
-
-            return NONE;
-        }
-    },
-    SINGLE {
-        public QuoteMode onChar(char c) {
-            if (c == '\'') {
-                return NONE;
-            }
-
-            return SINGLE;
-        }
-    },
-    DOUBLE {
-        public QuoteMode onChar(char c) {
-            if (c == '\"') {
-                return NONE;
-            }
-
-            return DOUBLE;
-        }
-    },
-    BACKTICK {
-        public QuoteMode onChar(char c) {
-            if (c == '`') {
-                return NONE;
-            }
-
-            return BACKTICK;
-        }
-    },
-    BRACKET {
-        public QuoteMode onChar(char c) {
-            if (c == ']') {
-                return NONE;
-            }
-
-            return BRACKET;
-        }
-    };
-
-    public abstract QuoteMode onChar(char c);
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ResultSetInvocationHandler.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ResultSetInvocationHandler.java
deleted file mode 100644
index d01a85489d..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ResultSetInvocationHandler.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.ResultSet;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class ResultSetInvocationHandler implements InvocationHandler {
-
-    private static final Map<String, Method> METHODS = new HashMap<String, Method>();
-    private static final Method GET_OBJECT_FOR_CLASS_METHOD;
-    private static final Method GET_OBJECT_FOR_MAP_METHOD;
-    
-    static {
-        try {
-            METHODS.put("getString", ResultSet.class.getMethod("getString", int.class));
-            METHODS.put("getBoolean", ResultSet.class.getMethod("getBoolean", int.class));
-            METHODS.put("getByte", ResultSet.class.getMethod("getByte", int.class));
-            METHODS.put("getShort", ResultSet.class.getMethod("getShort", int.class));
-            METHODS.put("getInt", ResultSet.class.getMethod("getInt", int.class));
-            METHODS.put("getLong", ResultSet.class.getMethod("getLong", int.class));
-            METHODS.put("getFloat", ResultSet.class.getMethod("getFloat", int.class));
-            METHODS.put("getDouble", ResultSet.class.getMethod("getDouble", int.class));
-            METHODS.put("getBigDecimal", ResultSet.class.getMethod("getBigDecimal", int.class));
-            METHODS.put("getBytes", ResultSet.class.getMethod("getBytes", int.class));
-            METHODS.put("getDate", ResultSet.class.getMethod("getDate", int.class));
-            METHODS.put("getTime", ResultSet.class.getMethod("getTime", int.class));
-            METHODS.put("getTimestamp", ResultSet.class.getMethod("getTimestamp", int.class));
-            METHODS.put("getAsciiStream", ResultSet.class.getMethod("getAsciiStream", int.class));
-            METHODS.put("getUnicodeStream", ResultSet.class.getMethod("getUnicodeStream", int.class));
-            METHODS.put("getBinaryStream", ResultSet.class.getMethod("getBinaryStream", int.class));
-            METHODS.put("getObject", ResultSet.class.getMethod("getObject", int.class));
-            METHODS.put("getCharacterStream", ResultSet.class.getMethod("getCharacterStream", int.class));
-            METHODS.put("getRef", ResultSet.class.getMethod("getRef", int.class));
-            METHODS.put("getBlob", ResultSet.class.getMethod("getBlob", int.class));
-            METHODS.put("getClob", ResultSet.class.getMethod("getClob", int.class));
-            METHODS.put("getArray", ResultSet.class.getMethod("getArray", int.class));
-            METHODS.put("getURL", ResultSet.class.getMethod("getURL", int.class));
-            METHODS.put("getRowId", ResultSet.class.getMethod("getRowId", int.class));
-            METHODS.put("getNClob", ResultSet.class.getMethod("getNClob", int.class));
-            METHODS.put("getSQLXML", ResultSet.class.getMethod("getSQLXML", int.class));
-            METHODS.put("getNString", ResultSet.class.getMethod("getNString", int.class));
-            METHODS.put("getNCharacterStream", ResultSet.class.getMethod("getNCharacterStream", int.class));
-
-            METHODS.put("getBigDecimal2", ResultSet.class.getMethod("getBigDecimal", int.class, int.class));
-            METHODS.put("getDate2", ResultSet.class.getMethod("getDate", int.class, Calendar.class));
-            METHODS.put("getTime2", ResultSet.class.getMethod("getTime", int.class, Calendar.class));
-            METHODS.put("getTimestamp2", ResultSet.class.getMethod("getTimestamp", int.class, Calendar.class));
-            
-            GET_OBJECT_FOR_CLASS_METHOD = ResultSet.class.getMethod("getObject", int.class, Class.class);
-            GET_OBJECT_FOR_MAP_METHOD = ResultSet.class.getMethod("getObject", int.class, Map.class);
-        } catch (NoSuchMethodException ex) {
-            throw new RuntimeException(ex);
-        }
-
-    }
-    
-    private final ResultSet delegate;
-    private final Map<String, Integer> aliasIndex;
-    private final HibernateReturningResult<?> returningResult;
-    private final boolean calculateRowCount;
-    private int rowCount = 0;
-
-    public ResultSetInvocationHandler(ResultSet delegate, Map<String, Integer> aliasIndex, HibernateReturningResult<?> returningResult) {
-        this.delegate = delegate;
-        this.aliasIndex = aliasIndex;
-        this.returningResult = returningResult;
-        this.calculateRowCount = returningResult != null;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        Method indexMethod;
-        int parameterCount = method.getParameterTypes().length;
-        if (parameterCount == 1 && (indexMethod = METHODS.get(method.getName())) != null) {
-            return indexMethod.invoke(delegate, aliasIndex.get(args[0]));
-        } else if (parameterCount > 1) {
-            if ((indexMethod = METHODS.get(method.getName() + parameterCount)) != null) {
-                Object[] newArgs = new Object[args.length];
-                System.arraycopy(args, 0, newArgs, 0, args.length);
-                newArgs[0] = aliasIndex.get(args[0]);
-                return indexMethod.invoke(delegate, newArgs);
-            } else if ("getObject".equals(method.getName())) {
-                Object[] newArgs = new Object[args.length];
-                System.arraycopy(args, 0, newArgs, 0, args.length);
-                newArgs[0] = aliasIndex.get(args[0]);
-                
-                // Special handling for getObject
-                if (method.getParameterTypes()[1].equals(Class.class)) {
-                    return GET_OBJECT_FOR_CLASS_METHOD.invoke(delegate, newArgs);
-                } else {
-                    return GET_OBJECT_FOR_MAP_METHOD.invoke(delegate, newArgs);
-                }
-            }
-        } else if (calculateRowCount) {
-            if ("next".equals(method.getName())) {
-                Object result = method.invoke(delegate, args);
-                if ((Boolean) result) {
-                    rowCount++;
-                }
-                return result;
-            } else if ("close".equals(method.getName())) {
-                returningResult.setUpdateCount(rowCount);
-            }
-        }
-        
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ScrollableResultsIterator.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ScrollableResultsIterator.java
deleted file mode 100644
index 2c3417165e..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/ScrollableResultsIterator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.ScrollableResults;
-
-import java.io.Closeable;
-import java.util.Iterator;
-
-/**
- * Iterator over {@code ScrollableResults}.
- *
- * @author Jan-Willem Gmelig Meyling
- * @since 1.6.2
- */
-public class ScrollableResultsIterator implements Iterator<Object>, Closeable {
-
-    private final ScrollableResults scrollableResults;
-    private Object[] next;
-
-    public ScrollableResultsIterator(ScrollableResults scrollableResults) {
-        this.scrollableResults = scrollableResults;
-    }
-
-    @Override
-    public boolean hasNext() {
-        return next != null || (scrollableResults.next() && (next = scrollableResults.get()) != null);
-    }
-
-    @Override
-    public Object next() {
-        Object[] next = this.next;
-        this.next = null;
-        if (next.length == 1) {
-            return next[0];
-        } else {
-            return next;
-        }
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException("remove");
-    }
-
-    @Override
-    public void close() {
-        scrollableResults.close();
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleDatabase.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleDatabase.java
deleted file mode 100644
index 3bfd4c87f0..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleDatabase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.Mapping;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Table;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class SimpleDatabase implements Database {
-
-    private final Map<String, Table> tables;
-
-    public SimpleDatabase(Iterator<Table> iter, Dialect dialect, TableNameFormatter formatter, Mapping mapping) {
-        Map<String, Table> map = new HashMap<String, Table>();
-        while (iter.hasNext()) {
-            Table t = iter.next();
-            map.put(formatter.getQualifiedTableName(dialect, t), t);
-            if (t.getSubselect() != null) {
-                map.put("( " + t.getSubselect() + " )", t);
-            }
-            Iterator<Column> columnIter = t.getColumnIterator();
-            while (columnIter.hasNext()) {
-                final Column column = columnIter.next();
-                column.getSqlType(dialect, mapping);
-            }
-        }
-        this.tables = Collections.unmodifiableMap(map);
-    }
-
-    @Override
-    public Table getTable(String name) {
-        return tables.get(name);
-    }
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleTableNameFormatter.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleTableNameFormatter.java
deleted file mode 100644
index 1c7916ff31..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SimpleTableNameFormatter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.blazebit.persistence.integration.hibernate.base;
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class SimpleTableNameFormatter implements TableNameFormatter {
-
-    // copied from org.hibernate.boot.model.relational.QualifiedNameParser.NameParts()
-    public String getQualifiedTableName(Dialect dialect, Table table) {
-        final String catalogName = table.getCatalog();
-        final String schemaName = table.getSchema();
-        final String objectName = table.getName();
-
-        StringBuilder buff = new StringBuilder();
-        if (catalogName != null) {
-            buff.append(catalogName.toString()).append('.');
-        }
-
-        if (schemaName != null) {
-            buff.append(schemaName.toString()).append('.');
-        }
-
-        buff.append(objectName.toString());
-        return buff.toString();
-    }
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectLoaderUtils.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectLoaderUtils.java
deleted file mode 100644
index 060f15fac4..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectLoaderUtils.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.engine.spi.QueryParameters;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.sql.PreparedStatement;
-
-/**
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.1
- */
-public class SubselectLoaderUtils {
-
-    private static final Constructor<? extends PreparedStatement> PROXY_CONSTRUCTOR;
-
-    static {
-        try {
-            Class<? extends PreparedStatement> proxyClass = (Class<? extends PreparedStatement>)
-                    Proxy.getProxyClass(SubselectPreparedStatementProxyHandler.class.getClassLoader(), PreparedStatement.class);
-            PROXY_CONSTRUCTOR = proxyClass.getConstructor(InvocationHandler.class);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private SubselectLoaderUtils() {
-    }
-
-    public static PreparedStatement getPreparedStatementProxy(PreparedStatement delegate, QueryParameters queryParameters, int cteParameterCount, int selectParameterCount) {
-        try {
-            return PROXY_CONSTRUCTOR.newInstance(new SubselectPreparedStatementProxyHandler(delegate, queryParameters, cteParameterCount, selectParameterCount));
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    public static int applyCteAndCountParameters(String originalSql, StringBuilder sb) {
-        int brackets = 0;
-        int cteParameterCount = 0;
-        boolean cteMode = false;
-        QuoteMode mode = QuoteMode.NONE;
-
-        for (int i = 0; i < originalSql.length(); i++) {
-            final char c = originalSql.charAt(i);
-            mode = mode.onChar(c);
-
-            if (mode == QuoteMode.NONE) {
-                if (c == '(') {
-                    brackets++;
-                } else if (c == ')') {
-                    brackets--;
-                    if (brackets == 0) {
-                        cteMode = !cteMode;
-                    }
-                } else if (c == '?') {
-                    cteParameterCount++;
-                }
-
-                if (!cteMode && brackets == 0 && originalSql.regionMatches(true, i, "select ", 0, "select ".length())) {
-                    break;
-                }
-            }
-
-            sb.append(c);
-        }
-
-        return cteParameterCount;
-    }
-
-    public static int countSelectParameters(String originalSql, int startIndex) {
-        int brackets = 0;
-        int selectParameterCount = 0;
-        QuoteMode mode = QuoteMode.NONE;
-
-        for (int i = startIndex; i < originalSql.length(); i++) {
-            final char c = originalSql.charAt(i);
-            mode = mode.onChar(c);
-
-            if (mode == QuoteMode.NONE) {
-                if (c == '(') {
-                    brackets++;
-                } else if (c == ')') {
-                    brackets--;
-                } else if (c == '?') {
-                    selectParameterCount++;
-                }
-
-                if (brackets == 0 && originalSql.regionMatches(true, i, "from ", 0, "from ".length())) {
-                    break;
-                }
-            }
-        }
-
-        return selectParameterCount;
-    }
-
-    public static String getSubselectQueryForHibernatePre5(String subselectQuery) {
-        // Hibernate before 5 couldn't find the correct from clause
-        StringBuilder sb = null;
-        int parens = 0;
-
-        for (int i = 0; i < subselectQuery.length(); i++) {
-            final char c = subselectQuery.charAt(i);
-            if (c == '(') {
-                parens++;
-            } else if (c == ')') {
-                parens--;
-                if (parens < 0) {
-                    // This is the case when we have a CTE
-                    int fromIndex = subselectQuery.indexOf(" from ");
-                    int startIndex = i;
-                    int otherFromIndex;
-                    do {
-                        otherFromIndex = subselectQuery.indexOf(" from ", startIndex);
-                        parens = 0;
-                        for (int j = i + 1; j < otherFromIndex; j++) {
-                            final char c2 = subselectQuery.charAt(j);
-                            if (c2 == '(') {
-                                parens++;
-                            } else if (c2 == ')') {
-                                parens--;
-                            }
-                        }
-                        startIndex = otherFromIndex + 1;
-                    } while (parens != 0);
-                    sb = new StringBuilder(fromIndex + (subselectQuery.length() - otherFromIndex));
-                    sb.append(subselectQuery, 0, fromIndex);
-                    sb.append(subselectQuery, otherFromIndex, subselectQuery.length());
-                    break;
-                }
-            }
-        }
-
-        if (sb != null) {
-            subselectQuery = sb.toString();
-        }
-        return subselectQuery;
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectPreparedStatementProxyHandler.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectPreparedStatementProxyHandler.java
deleted file mode 100644
index 79a42c0be5..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/SubselectPreparedStatementProxyHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.engine.spi.QueryParameters;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-
-/**
- * Hibernate always binds positioned parameters before named parameters, which is problematic
- * for any CTE prepended to the query, for which its parameters will be bound out of order.
- * This {@code InvocationHandler} ensures that the indexes used for parameter bindings
- * are adjusted accordingly, effectively swapping the positional query parameters with the
- * named query parameters in the CTE query segment.
- *
- * @author Jan-Willem Gmelig Meyling
- * @since 1.2.1
- */
-public class SubselectPreparedStatementProxyHandler implements InvocationHandler {
-
-    private final PreparedStatement delegate;
-    private final QueryParameters queryParameters;
-    private final int cteParameterCount;
-    private final int selectParameterCount;
-
-    public SubselectPreparedStatementProxyHandler(PreparedStatement delegate, QueryParameters queryParameters, int cteParameterCount, int selectParameterCount) {
-        this.delegate = delegate;
-        this.queryParameters = queryParameters;
-        this.cteParameterCount = cteParameterCount;
-        this.selectParameterCount = selectParameterCount;
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if (method.getName().startsWith("set") && args.length >= 2) {
-            int index = (int) args[0];
-            int positionalParameterCount = queryParameters.getFilteredPositionalParameterTypes().length;
-            int ctePositionedParameterStartIndex = 1;
-            int cteNamedParameterStartIndex = ctePositionedParameterStartIndex + positionalParameterCount;
-            int regularNamedParameterStartIndex = cteNamedParameterStartIndex + cteParameterCount;
-
-            boolean isPositionedParamRegular = index < cteNamedParameterStartIndex;
-            boolean isNamedParamCte = index < regularNamedParameterStartIndex;
-            index += isPositionedParamRegular ? cteParameterCount : isNamedParamCte ? -positionalParameterCount : 0;
-
-            if (index > cteParameterCount) {
-                // We skip the select parameters
-                index -= selectParameterCount;
-                if (index <= cteParameterCount) {
-                    return null;
-                }
-            }
-            args[0] = index;
-        }
-        return method.invoke(delegate, args);
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/TableNameFormatter.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/TableNameFormatter.java
deleted file mode 100644
index b1b1f94f5a..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/TableNameFormatter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.mapping.Table;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface TableNameFormatter  {
-
-    public String getQualifiedTableName(Dialect dialect, Table table);
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/AbstractHibernateEntityManagerFactoryIntegrator.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/AbstractHibernateEntityManagerFactoryIntegrator.java
deleted file mode 100644
index c18a48c8ad..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/AbstractHibernateEntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base.function;
-
-import com.blazebit.persistence.integration.hibernate.base.spi.HibernateVersionProvider;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpqlFunction;
-import com.blazebit.persistence.spi.JpqlFunctionGroup;
-import org.hibernate.Session;
-import org.hibernate.Version;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.SQLFunction;
-import org.hibernate.dialect.function.SQLFunctionRegistry;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.sql.Connection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.jar.Manifest;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public abstract class AbstractHibernateEntityManagerFactoryIntegrator implements EntityManagerFactoryIntegrator {
-
-    protected static final int MAJOR;
-    protected static final int MINOR;
-    protected static final int FIX;
-    protected static final String TYPE;
-
-    private static final Logger LOG = Logger.getLogger(EntityManagerFactoryIntegrator.class.getName());
-    private static final boolean USE_FUNCTION_REGISTRY;
-    private static final String VERSION_STRING;
-
-    static {
-        HibernateVersionProvider usedProvider = null;
-        try {
-            Iterator<HibernateVersionProvider> iter = ServiceLoader.load(HibernateVersionProvider.class).iterator();
-            if (iter.hasNext()) {
-                usedProvider = iter.next();
-                VERSION_STRING = usedProvider.getVersion();
-            } else {
-                String versionString = Version.getVersionString();
-                if ("[WORKING]".equals(versionString)) {
-                    try {
-                        Method getModule = Class.class.getMethod("getModule");
-                        Method getDescriptor = getModule.getReturnType().getMethod("getDescriptor");
-                        Method version = getDescriptor.getReturnType().getMethod("version");
-                        Method get = version.getReturnType().getMethod("get");
-                        Object module = getModule.invoke(Version.class);
-                        Object descriptor = getDescriptor.invoke(module);
-                        if (descriptor == null) {
-                            versionString = null;
-                        } else {
-                            Object versionOptional = version.invoke(descriptor);
-                            versionString = get.invoke(versionOptional).toString();
-                        }
-                    } catch (NoSuchMethodException ex) {
-                        throw new IllegalArgumentException("Error while trying to resolve the Hibernate version. This can happen when using an uber-jar deployment. In that case, please provide a service provider implementation of " + HibernateVersionProvider.class.getName());
-                    } catch (Exception ex) {
-                        throw new IllegalArgumentException("An error happened while trying to resolve the Hibernate version through the module version descriptor", ex);
-                    }
-                }
-                if (versionString == null) {
-                    // Try one last way to resolve the version by scanning for manifest files
-                    try {
-                        String versionClassUrl = Version.class.getClassLoader().getResource("org/hibernate/Version.class").toString();
-                        String baseUrl = versionClassUrl.substring(0, versionClassUrl.length() - "org/hibernate/Version.class".length());
-                        Enumeration<URL> resources = Version.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
-                        if (resources != null) {
-                            while (resources.hasMoreElements()) {
-                                URL url = resources.nextElement();
-                                if (url.toString().startsWith(baseUrl)) {
-                                    try (InputStream is = url.openStream()) {
-                                        Manifest manifest = new Manifest(is);
-                                        versionString = manifest.getMainAttributes().getValue("Implementation-Version");
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    } catch (Exception ex) {
-                        throw new IllegalArgumentException("An error happened while trying to resolve the Hibernate version through the MANIFEST.MF file", ex);
-                    }
-                }
-                VERSION_STRING = versionString;
-            }
-            String[] parts = VERSION_STRING.split("[\\.-]");
-            MAJOR = Integer.parseInt(parts[0]);
-            MINOR = Integer.parseInt(parts[1]);
-            FIX = Integer.parseInt(parts[2]);
-            TYPE = parts[3];
-        } catch (RuntimeException ex) {
-            if (usedProvider == null) {
-                throw new IllegalArgumentException("Error while trying to resolve the Hibernate version. This can happen when using an uber-jar deployment. In that case, please provide a service provider implementation of " + HibernateVersionProvider.class.getName(), ex);
-            } else {
-                throw new IllegalArgumentException("An error happened while trying to resolve the Hibernate version through the version provider " + usedProvider.getClass().getName(), ex);
-            }
-        }
-        boolean useFunctionRegistry = false;
-        try {
-            SQLFunctionRegistry.class.getDeclaredField("userFunctions");
-        } catch (NoSuchFieldException ex) {
-            // The field was removed in Hibernate 5.0.0.Beta1 which marks the point at which SQLFunctionRegistry is the driver for finding functions
-            useFunctionRegistry = true;
-        }
-        USE_FUNCTION_REGISTRY = useFunctionRegistry;
-    }
-
-    protected String getDbmsName(EntityManagerFactory emf, EntityManager em, Dialect dialect) {
-        Set<String> classNames = getClassNames(dialect);
-        if (classNames.contains("org.hibernate.dialect.MySQL8Dialect") || classNames.contains("org.hibernate.dialect.MariaDB10Dialect")) {
-            return "mysql8";
-        } else if (classNames.contains("org.hibernate.dialect.MySQLDialect")) {
-            try {
-                boolean close = em == null;
-                EntityManager entityManager = em == null ? emf.createEntityManager() : em;
-                try {
-                    Connection connection = entityManager.unwrap(SessionImplementor.class).connection();
-                    if (connection.getMetaData().getDatabaseMajorVersion() > 7) {
-                        return "mysql8";
-                    } else {
-                        return "mysql";
-                    }
-                } finally {
-                    if (close) {
-                        entityManager.close();
-                    }
-                }
-            } catch (Exception ex) {
-                throw new RuntimeException("Could not determine the MySQL Server version!", ex);
-            }
-        } else if (classNames.contains("org.hibernate.dialect.DB2Dialect")) {
-            return "db2";
-        } else if (classNames.contains("org.hibernate.dialect.PostgreSQL81Dialect") || classNames.contains("org.hibernate.dialect.PostgreSQLDialect")) {
-            return "postgresql";
-        } else if (classNames.contains("org.hibernate.dialect.Oracle8iDialect") || classNames.contains("org.hibernate.dialect.Oracle9Dialect") || classNames.contains("org.hibernate.dialect.OracleDialect")) {
-            return "oracle";
-        } else if (classNames.contains("org.hibernate.dialect.SQLServerDialect")) {
-            return "microsoft";
-        } else if (classNames.contains("org.hibernate.dialect.SybaseDialect")) {
-            return "sybase";
-        } else if (classNames.contains("org.hibernate.dialect.H2Dialect")) {
-            return "h2";
-        } else if (classNames.contains("org.hibernate.dialect.CUBRIDDialect")) {
-            return "cubrid";
-        } else if (classNames.contains("org.hibernate.dialect.HSQLDialect")) {
-            return "hsql";
-        } else if (classNames.contains("org.hibernate.dialect.InformixDialect")) {
-            return "informix";
-        } else if (classNames.contains("org.hibernate.dialect.IngresDialect")) {
-            return "ingres";
-        } else if (classNames.contains("org.hibernate.dialect.InterbaseDialect")) {
-            return "interbase";
-        } else if (classNames.contains("org.hibernate.dialect.CockroachDB192Dialect")) {
-            return "cockroach";
-        } else {
-            return null;
-        }
-    }
-
-    private Set<String> getClassNames(Dialect dialect) {
-        Set<String> classNames = new HashSet<>();
-        Class<?> c = dialect.getClass();
-        do {
-            classNames.add(c.getName());
-        } while ((c = c.getSuperclass()) != Object.class);
-        return classNames;
-    }
-
-    @Override
-    public EntityManagerFactory registerFunctions(EntityManagerFactory entityManagerFactory, Map<String, JpqlFunctionGroup> dbmsFunctions) {
-        EntityManager em = null;
-
-        try {
-            em = entityManagerFactory.createEntityManager();
-            Session s = em.unwrap(Session.class);
-            Map<String, SQLFunction> originalFunctions = getFunctions(s);
-            Map<String, SQLFunction> functions = new TreeMap<String, SQLFunction>(String.CASE_INSENSITIVE_ORDER);
-            functions.putAll(originalFunctions);
-            Dialect dialect = getDialect(s);
-            String dbms = getDbmsName(entityManagerFactory, em, dialect);
-
-            for (Map.Entry<String, JpqlFunctionGroup> functionEntry : dbmsFunctions.entrySet()) {
-                String functionName = functionEntry.getKey();
-                JpqlFunctionGroup dbmsFunctionMap = functionEntry.getValue();
-                JpqlFunction function = dbmsFunctionMap.get(dbms);
-
-                if (function == null && !dbmsFunctionMap.contains(dbms)) {
-                    function = dbmsFunctionMap.get(null);
-                }
-                if (function == null) {
-                    if (functions.containsKey(functionName)) {
-                        LOG.finest("Using ORM registered function '" + functionName + "' because there is neither an implementation for the dbms '" + dbms + "' nor a default implementation.");
-                    } else {
-                        LOG.warning("Could not register the function '" + functionName + "' because there is neither an implementation for the dbms '" + dbms + "' nor a default implementation!");
-                    }
-                } else {
-                    functions.put(functionName, new HibernateJpqlFunctionAdapter(function));
-                }
-            }
-
-            replaceFunctions(s, functions);
-
-            return entityManagerFactory;
-        } finally {
-            if (em != null) {
-                em.close();
-            }
-        }
-    }
-
-    @Override
-    public Map<String, JpqlFunction> getRegisteredFunctions(EntityManagerFactory entityManagerFactory) {
-        EntityManager em = null;
-
-        try {
-            em = entityManagerFactory.createEntityManager();
-            Session s = em.unwrap(Session.class);
-            SessionFactoryImplementor sf = (SessionFactoryImplementor) s.getSessionFactory();
-            Map<String, SQLFunction> functions = getFunctions(s);
-            Map<String, JpqlFunction> map = new HashMap<>(functions.size());
-            for (Map.Entry<String, SQLFunction> entry : functions.entrySet()) {
-                SQLFunction function = entry.getValue();
-                if (function instanceof HibernateJpqlFunctionAdapter) {
-                    map.put(entry.getKey(), ((HibernateJpqlFunctionAdapter) function).unwrap());
-                } else {
-                    map.put(entry.getKey(), new HibernateSQLFunctionAdapter(sf, entry.getValue()));
-                }
-            }
-            return map;
-        } finally {
-            if (em != null) {
-                em.close();
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Map<String, SQLFunction> getFunctions(Session s) {
-        if (USE_FUNCTION_REGISTRY) {
-            SessionFactoryImplementor sf = (SessionFactoryImplementor) s.getSessionFactory();
-            SQLFunctionRegistry registry = sf.getSqlFunctionRegistry();
-            Exception ex;
-
-            // We have to retrieve the functionMap the old fashioned way via reflection :(
-            Field f = null;
-            boolean madeAccessible = false;
-
-            try {
-                f = SQLFunctionRegistry.class.getDeclaredField("functionMap");
-                madeAccessible = !f.isAccessible();
-
-                if (madeAccessible) {
-                    f.setAccessible(true);
-                }
-
-                return (Map<String, SQLFunction>) f.get(registry);
-            } catch (NoSuchFieldException e) {
-                ex = e;
-            } catch (IllegalArgumentException e) {
-                // This can never happen
-                ex = e;
-            } catch (IllegalAccessException e) {
-                ex = e;
-            } finally {
-                if (f != null && madeAccessible) {
-                    f.setAccessible(false);
-                }
-            }
-
-            throw new RuntimeException("Could not access the function map to dynamically register functions. Please report the version of hibernate your are using so we can provide support for it!", ex);
-        } else {
-            // Implementation detail: Hibernate uses a mutable map, so we can do this
-            return getDialect(s).getFunctions();
-        }
-    }
-
-    private void replaceFunctions(Session s, Map<String, SQLFunction> newFunctions) {
-        if (USE_FUNCTION_REGISTRY) {
-            SessionFactoryImplementor sf = (SessionFactoryImplementor) s.getSessionFactory();
-            SQLFunctionRegistry registry = sf.getSqlFunctionRegistry();
-            Exception ex;
-
-            // We have to retrieve the functionMap the old fashioned way via reflection :(
-            Field f = null;
-            boolean madeAccessible = false;
-
-            try {
-                f = SQLFunctionRegistry.class.getDeclaredField("functionMap");
-                madeAccessible = !f.isAccessible();
-
-                if (madeAccessible) {
-                    f.setAccessible(true);
-                }
-
-                f.set(registry, newFunctions);
-                return;
-            } catch (NoSuchFieldException e) {
-                ex = e;
-            } catch (IllegalArgumentException e) {
-                // This can never happen
-                ex = e;
-            } catch (IllegalAccessException e) {
-                ex = e;
-            } finally {
-                if (f != null && madeAccessible) {
-                    f.setAccessible(false);
-                }
-            }
-
-            throw new RuntimeException("Could not access the function map to dynamically register functions. Please report the version of hibernate your are using so we can provide support for it!", ex);
-        } else {
-            Exception ex;
-            Field f = null;
-            boolean madeAccessible = false;
-
-            try {
-                f = Dialect.class.getDeclaredField("sqlFunctions");
-                madeAccessible = !f.isAccessible();
-
-                if (madeAccessible) {
-                    f.setAccessible(true);
-                }
-
-                f.set(getDialect(s), newFunctions);
-                return;
-            } catch (NoSuchFieldException e) {
-                ex = e;
-            } catch (IllegalArgumentException e) {
-                // This can never happen
-                ex = e;
-            } catch (IllegalAccessException e) {
-                ex = e;
-            } finally {
-                if (f != null && madeAccessible) {
-                    f.setAccessible(false);
-                }
-            }
-            throw new RuntimeException("Could not access the function map to dynamically register functions. Please report the version of hibernate your are using so we can provide support for it!", ex);
-        }
-    }
-
-    protected Dialect getDialect(Session s) {
-        SessionFactoryImplementor sf = (SessionFactoryImplementor) s.getSessionFactory();
-        return sf.getDialect();
-    }
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateFunctionRenderContext.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateFunctionRenderContext.java
deleted file mode 100644
index 0ab1f23d34..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateFunctionRenderContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-
-import java.util.List;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class HibernateFunctionRenderContext implements FunctionRenderContext {
-    
-    private final StringBuilder sb = new StringBuilder();
-    private final List<?> arguments;
-
-    public HibernateFunctionRenderContext(List<?> arguments) {
-        this.arguments = arguments;
-    }
-
-    @Override
-    public int getArgumentsSize() {
-        return arguments.size();
-    }
-
-    @Override
-    public String getArgument(int index) {
-        return arguments.get(index).toString();
-    }
-
-    @Override
-    public void addArgument(int index) {
-        sb.append(arguments.get(index));
-    }
-
-    @Override
-    public void addChunk(String chunk) {
-        sb.append(chunk);
-    }
-    
-    public String renderToString() {
-        return sb.toString();
-    }
-
-    @Override
-    public String toString() {
-        return "HibernateFunctionRenderContext{" + "arguments=" + arguments + '}';
-    }
-    
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateJpqlFunctionAdapter.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateJpqlFunctionAdapter.java
deleted file mode 100644
index 335c1b5ee7..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateJpqlFunctionAdapter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base.function;
-
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.hibernate.QueryException;
-import org.hibernate.dialect.function.SQLFunction;
-import org.hibernate.engine.spi.Mapping;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.type.Type;
-
-import java.util.List;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class HibernateJpqlFunctionAdapter implements SQLFunction {
-    
-    private final JpqlFunction function;
-
-    public HibernateJpqlFunctionAdapter(JpqlFunction function) {
-        this.function = function;
-    }
-
-    public JpqlFunction unwrap() {
-        return function;
-    }
-
-    @Override
-    public boolean hasArguments() {
-        return function.hasArguments();
-    }
-
-    @Override
-    public boolean hasParenthesesIfNoArguments() {
-        return function.hasParenthesesIfNoArguments();
-    }
-
-    @Override
-    public Type getReturnType(Type firstArgumentType, Mapping mapping) throws QueryException {
-        SessionFactoryImplementor sfi = (SessionFactoryImplementor) mapping;
-        Class<?> argumentClass;
-        
-        if (firstArgumentType == null) {
-            argumentClass = null;
-        } else {
-            argumentClass = firstArgumentType.getReturnedClass();
-        }
-        
-        Class<?> returnType = function.getReturnType(argumentClass);
-        
-        if (returnType == null) {
-            return null;
-        } else if (argumentClass == returnType) {
-            return firstArgumentType;
-        }
-        
-        Type type = sfi.getTypeHelper().basic(returnType);
-        
-        if (type != null) {
-            return type;
-        }
-
-        if (sfi.getEntityPersisters().containsKey(returnType.getName())) {
-            return sfi.getTypeHelper().entity(returnType);
-        }
-
-        return sfi.getTypeHelper().custom(returnType);
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public String render(Type firstArgumentType, List args, SessionFactoryImplementor factory) throws QueryException {
-        HibernateFunctionRenderContext context = new HibernateFunctionRenderContext(args);
-        function.render(context);
-        return context.renderToString();
-    }
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateSQLFunctionAdapter.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateSQLFunctionAdapter.java
deleted file mode 100644
index 4b5f989024..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/function/HibernateSQLFunctionAdapter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base.function;
-
-import com.blazebit.persistence.spi.FunctionRenderContext;
-import com.blazebit.persistence.spi.JpqlFunction;
-import org.hibernate.MappingException;
-import org.hibernate.dialect.function.SQLFunction;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.type.Type;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class HibernateSQLFunctionAdapter implements JpqlFunction {
-
-    private final SessionFactoryImplementor sfi;
-    private final SQLFunction function;
-
-    public HibernateSQLFunctionAdapter(SessionFactoryImplementor sfi, SQLFunction function) {
-        this.sfi = sfi;
-        this.function = function;
-    }
-
-    @Override
-    public boolean hasArguments() {
-        return function.hasArguments();
-    }
-
-    @Override
-    public boolean hasParenthesesIfNoArguments() {
-        return function.hasParenthesesIfNoArguments();
-    }
-
-    @Override
-    public Class<?> getReturnType(Class<?> firstArgumentType) {
-        if (firstArgumentType == null) {
-            return null;
-        }
-        Type type = sfi.getTypeHelper().basic(firstArgumentType);
-        if (type == null) {
-            if (sfi.getEntityPersisters().get(firstArgumentType.getName()) != null) {
-                type = sfi.getTypeHelper().entity(firstArgumentType);
-            } else {
-                try {
-                    type = sfi.getTypeHelper().custom(firstArgumentType);
-                } catch (MappingException ex) {
-                    type = sfi.getTypeHelper().heuristicType(firstArgumentType.getName());
-                }
-            }
-        }
-
-        if (type != null) {
-            Type returnType = function.getReturnType(type, sfi);
-            if (returnType != null) {
-                return returnType.getReturnedClass();
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public void render(FunctionRenderContext context) {
-        throw new UnsupportedOperationException("Rendering functions through this API is not possible!");
-    }
-
-}
diff --git a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/spi/HibernateVersionProvider.java b/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/spi/HibernateVersionProvider.java
deleted file mode 100644
index fe446104cc..0000000000
--- a/integration/hibernate-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/spi/HibernateVersionProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.hibernate.base.spi;
-
-/**
- * Simple service provider that is instantiated via {@link java.util.ServiceLoader} means.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface HibernateVersionProvider {
-
-    /**
-     * Returns the overridden version of Hibernate that should be used.
-     *
-     * @return The version
-     */
-    public String getVersion();
-
-}
diff --git a/integration/hibernate6-base/pom.xml b/integration/hibernate6-base/pom.xml
index 30fecf6cd5..9e305560bf 100644
--- a/integration/hibernate6-base/pom.xml
+++ b/integration/hibernate6-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,26 +21,19 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.hibernate.base</module.name>
-        <main.java.version>1.8</main.java.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
@@ -53,7 +46,7 @@
         
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
+            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
         </dependency>
         
         <dependency>
@@ -63,114 +56,26 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.hibernate.orm.core;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.core;
-                                        exports com.blazebit.persistence.integration.hibernate.base;
-                                        exports com.blazebit.persistence.integration.hibernate.base.spi;
-                                        uses com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
-                                        uses com.blazebit.persistence.integration.hibernate.base.spi.HibernateVersionProvider;
-                                        provides com.blazebit.persistence.spi.ExtendedQuerySupport with com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
     <profiles>
         <!-- Profiles for various Hibernate 6 versions -->
         <profile>
             <id>hibernate-6.2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <version.hibernate>${version.hibernate-6.2}</version.hibernate>
             </properties>
         </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.3}</version.hibernate>
-            </properties>
-        </profile>
         <profile>
             <id>hibernate-6.4</id>
             <properties>
                 <version.hibernate>${version.hibernate-6.4}</version.hibernate>
             </properties>
         </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.5}</version.hibernate>
-            </properties>
-        </profile>
         <profile>
             <id>hibernate-6.6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
diff --git a/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java b/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
index 6cae975845..798db3a340 100644
--- a/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
+++ b/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateExtendedQuerySupport.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.hibernate.base;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.ConfigurationProperties;
 import com.blazebit.persistence.ReturningResult;
 import com.blazebit.persistence.spi.ConfigurationSource;
 import com.blazebit.persistence.spi.DbmsDialect;
+import com.blazebit.persistence.spi.DbmsStatementType;
 import com.blazebit.persistence.spi.ExtendedQuerySupport;
 import com.blazebit.reflection.ReflectionUtils;
 import jakarta.persistence.EntityManager;
@@ -22,17 +22,23 @@
 import org.hibernate.HibernateException;
 import org.hibernate.NonUniqueResultException;
 import org.hibernate.ScrollMode;
+import org.hibernate.action.internal.BulkOperationCleanupAction;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.SubselectFetch;
 import org.hibernate.internal.FilterJdbcParameter;
+import org.hibernate.internal.util.MutableObject;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.internal.util.collections.BoundedConcurrentHashMap;
 import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.TupleTransformer;
@@ -59,6 +65,7 @@
 import org.hibernate.query.sqm.sql.SqmTranslation;
 import org.hibernate.query.sqm.sql.SqmTranslator;
 import org.hibernate.query.sqm.sql.SqmTranslatorFactory;
+import org.hibernate.query.sqm.tree.SqmDmlStatement;
 import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
@@ -82,12 +89,16 @@
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
+import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.CollectionTableGroup;
 import org.hibernate.sql.ast.tree.from.LazyTableGroup;
+import org.hibernate.sql.ast.tree.from.MutatingTableReferenceGroupWrapper;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.insert.InsertStatement;
+import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
@@ -109,6 +120,7 @@
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.internal.RowTransformerTupleTransformerAdapter;
+import org.hibernate.sql.results.internal.SqlSelectionImpl;
 import org.hibernate.sql.results.internal.TupleMetadata;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
@@ -132,6 +144,7 @@
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
@@ -141,10 +154,10 @@
  * @author Christian Beikov
  * @since 1.6.7
  */
-@ServiceProvider(ExtendedQuerySupport.class)
 public class HibernateExtendedQuerySupport implements ExtendedQuerySupport {
 
     private static final Logger LOG = Logger.getLogger(HibernateExtendedQuerySupport.class.getName());
+    private static final String[] KNOWN_STATEMENTS = { "select ", "insert ", "update ", "delete " };
     private static final Constructor<TupleMetadata> TUPLE_METADATA_CONSTRUCTOR_62;
     private static final Constructor<TupleMetadata> TUPLE_METADATA_CONSTRUCTOR_63;
     private static final RowTransformer ROW_TRANSFORMER_SINGULAR_RETURN;
@@ -216,11 +229,7 @@ public String getSql(EntityManager em, Query query) {
         QuerySqmImpl<?> hqlQuery = query.unwrap(QuerySqmImpl.class);
         SessionFactoryImplementor factory = hqlQuery.getSessionFactory();
         CacheableSqmInterpretation interpretation = buildQueryPlan(query);
-        try {
-            return getJdbcOperation(factory, interpretation, hqlQuery).getSqlString();
-        } finally {
-            interpretation.domainParameterXref.clearExpansions();
-        }
+        return getJdbcOperation(factory, interpretation, hqlQuery).getSqlString();
     }
 
     @Override
@@ -230,43 +239,205 @@ public boolean getSqlContainsLimit() {
 
     @Override
     public List<String> getCascadingDeleteSql(EntityManager em, Query query) {
-        SessionFactoryImplementor sfi = em.unwrap(SessionImplementor.class).getSessionFactory();
         QuerySqmImpl<?> hqlQuery = query.unwrap(QuerySqmImpl.class);
         if (hqlQuery.getSqmStatement() instanceof SqmDeleteStatement<?>) {
-            SqmDeleteStatement<?> deleteStatement = (SqmDeleteStatement<?>) hqlQuery.getSqmStatement();
-            String mutatingEntityName = deleteStatement.getTarget().getModel().getHibernateEntityName();
-            EntityMappingType entityDescriptor = sfi.getMappingMetamodel().getEntityDescriptor(mutatingEntityName);
-            SqlAstTranslatorFactory sqlAstTranslatorFactory = sfi.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory();
-            List<String> deleteSqls = new ArrayList<>();
-            entityDescriptor.visitConstraintOrderedTables(
-                (tableExpression, tableKeyColumnsVisitationSupplier) -> {
-
-                    //                    final TableReference targetTableReference = new TableReference(
-                    //                            tableExpression,
-                    //                            null,
-                    //                            false,
-                    //                            sfi
-                    //                    );
-
-                    final Predicate matchingIdsPredicate = null;//new InSubQueryPredicate();
-                    //                        matchingIdsPredicateProducer.produceRestriction(
-                    //                                ids,
-                    //                                entityDescriptor,
-                    //                                targetTableReference,
-                    //                                tableKeyColumnsVisitationSupplier,
-                    //                                query
-                    //                        );
-
-                    //                    final SqlAstDeleteTranslator sqlAstTranslator = sqlAstTranslatorFactory.buildDeleteTranslator( sfi );
-                    //                    final JdbcDelete jdbcOperation = sqlAstTranslator.translate( new DeleteStatement( targetTableReference, matchingIdsPredicate ) );
-                }
-            );
+            List<JdbcOperationQueryMutation> deletes = getCollectionTableDeletes( hqlQuery ).deletes;
+
+            List<String> deleteSqls = new ArrayList<>( deletes.size() );
+            for ( JdbcOperationQueryMutation delete : deletes ) {
+                deleteSqls.add( delete.getSqlString() );
+            }
             return deleteSqls;
         }
 
         return Collections.EMPTY_LIST;
     }
 
+    private static class CollectionTableDeleteInfo {
+        private final List<JdbcOperationQueryMutation> deletes;
+        private final JdbcParameterBindings parameterBindings;
+
+        public CollectionTableDeleteInfo(
+                List<JdbcOperationQueryMutation> deletes,
+                JdbcParameterBindings parameterBindings) {
+            this.deletes = deletes;
+            this.parameterBindings = parameterBindings;
+        }
+    }
+
+    private static CollectionTableDeleteInfo getCollectionTableDeletes(QuerySqmImpl<?> hqlQuery) {
+        SessionFactoryImplementor sfi = hqlQuery.getSessionFactory();
+        SqmDeleteStatement<?> deleteStatement = (SqmDeleteStatement<?>) hqlQuery.getSqmStatement();
+        String mutatingEntityName = deleteStatement.getTarget().getModel().getHibernateEntityName();
+        EntityMappingType entityDescriptor = sfi.getMappingMetamodel().getEntityDescriptor(mutatingEntityName);
+
+        CacheableSqmInterpretation sqmInterpretation = buildQueryPlan( hqlQuery );
+
+        Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref = SqmUtil.generateJdbcParamsXref(
+                hqlQuery.getDomainParameterXref(),
+                sqmInterpretation.getSqmTranslation()::getJdbcParamsBySqmParam
+        );
+
+        final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+                hqlQuery.getQueryParameterBindings(),
+                hqlQuery.getDomainParameterXref(),
+                jdbcParamsXref,
+                sfi.getRuntimeMetamodels().getMappingMetamodel(),
+                sqmInterpretation.getSqmTranslation().getFromClauseAccess()::findTableGroup,
+                new SqmParameterMappingModelResolutionAccess() {
+                    @Override @SuppressWarnings("unchecked")
+                    public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T> parameter) {
+                        return (MappingModelExpressible<T>) sqmInterpretation.getSqmTranslation().getSqmParameterMappingModelTypeResolutions().get(parameter);
+                    }
+                },
+                hqlQuery.getSession()
+        );
+        hqlQuery.getDomainParameterXref().clearExpansions();
+        DeleteStatement sqlAst = (DeleteStatement) sqmInterpretation.getSqmTranslation().getSqlAst();
+        final boolean missingRestriction = sqlAst.getRestriction() == null;
+        return new CollectionTableDeleteInfo( getCollectionTableDeletes(
+                entityDescriptor,
+                (tableReference, attributeMapping) -> {
+                    final TableGroup collectionTableGroup = new MutatingTableReferenceGroupWrapper(
+                            new NavigablePath( attributeMapping.getRootPathName() ),
+                            attributeMapping,
+                            (NamedTableReference) tableReference
+                    );
+
+                    final MutableObject<Predicate> additionalPredicate = new MutableObject<>();
+                    attributeMapping.getCollectionDescriptor().applyBaseRestrictions(
+                            p -> additionalPredicate.set( Predicate.combinePredicates( additionalPredicate.get(), p ) ),
+                            collectionTableGroup,
+                            sfi.getJdbcServices().getDialect().getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.TABLE_ALIAS,
+                            hqlQuery.getSession().getLoadQueryInfluencers().getEnabledFilters(),
+                            null,
+                            null
+                    );
+
+                    if ( missingRestriction ) {
+                        return additionalPredicate.get();
+                    }
+
+                    final ForeignKeyDescriptor fkDescriptor = attributeMapping.getKeyDescriptor();
+                    final Expression fkColumnExpression = MappingModelCreationHelper.buildColumnReferenceExpression(
+                            collectionTableGroup,
+                            fkDescriptor.getKeyPart(),
+                            null,
+                            sfi
+                    );
+
+                    final QuerySpec matchingIdSubQuery = new QuerySpec( false );
+
+                    final MutatingTableReferenceGroupWrapper tableGroup = new MutatingTableReferenceGroupWrapper(
+                            new NavigablePath( attributeMapping.getRootPathName() ),
+                            attributeMapping,
+                            sqlAst.getTargetTable()
+                    );
+                    final Expression fkTargetColumnExpression = MappingModelCreationHelper.buildColumnReferenceExpression(
+                            tableGroup,
+                            fkDescriptor.getTargetPart(),
+                            sqmInterpretation.getSqmTranslation().getSqlExpressionResolver(),
+                            sfi
+                    );
+                    matchingIdSubQuery.getSelectClause().addSqlSelection( new SqlSelectionImpl( 0, fkTargetColumnExpression ) );
+
+                    matchingIdSubQuery.getFromClause().addRoot(
+                            tableGroup
+                    );
+
+                    matchingIdSubQuery.applyPredicate( sqlAst.getRestriction() );
+
+                    return Predicate.combinePredicates(
+                            additionalPredicate.get(),
+                            new InSubQueryPredicate( fkColumnExpression, matchingIdSubQuery, false )
+                    );
+                },
+                jdbcParameterBindings,
+                SqmJdbcExecutionContextAdapter.usingLockingAndPaging( hqlQuery )
+        ), jdbcParameterBindings);
+    }
+
+    private static List<JdbcOperationQueryMutation> getCollectionTableDeletes(
+            EntityMappingType entityDescriptor,
+            BiFunction<TableReference, PluralAttributeMapping, Predicate> restrictionProducer,
+            JdbcParameterBindings jdbcParameterBindings,
+            ExecutionContext executionContext) {
+        List<PluralAttributeMapping> pluralAttributeMappings = collectCollectionTables( entityDescriptor );
+        List<JdbcOperationQueryMutation> deletes = new ArrayList<>( pluralAttributeMappings.size() );
+        for ( PluralAttributeMapping attributeMapping : pluralAttributeMappings ) {
+            final String separateCollectionTable = attributeMapping.getSeparateCollectionTable();
+
+            final SessionFactoryImplementor sessionFactory = executionContext.getSession().getFactory();
+            final JdbcServices jdbcServices = sessionFactory.getJdbcServices();
+
+            final NamedTableReference tableReference = new NamedTableReference(
+                    separateCollectionTable,
+                    DeleteStatement.DEFAULT_ALIAS,
+                    true
+            );
+
+            final DeleteStatement sqlAstDelete = new DeleteStatement(
+                    tableReference,
+                    restrictionProducer.apply( tableReference, attributeMapping )
+            );
+
+            deletes.add( jdbcServices.getJdbcEnvironment()
+                    .getSqlAstTranslatorFactory()
+                    .buildDeleteTranslator( sessionFactory, sqlAstDelete )
+                    .translate( jdbcParameterBindings, executionContext.getQueryOptions() )
+            );
+        }
+        return deletes;
+    }
+
+    private static List<PluralAttributeMapping> collectCollectionTables(EntityMappingType entityDescriptor) {
+        List<PluralAttributeMapping> pluralAttributeMappings = new ArrayList<>();
+        collectCollectionTables( entityDescriptor, pluralAttributeMappings );
+        return pluralAttributeMappings;
+    }
+
+    private static void collectCollectionTables(EntityMappingType entityDescriptor, List<PluralAttributeMapping> pluralAttributeMappings) {
+        if ( ! entityDescriptor.getEntityPersister().hasCollections() ) {
+            // none to clean-up
+            return;
+        }
+
+        entityDescriptor.visitSubTypeAttributeMappings(
+                attributeMapping -> {
+                    if ( attributeMapping instanceof PluralAttributeMapping ) {
+                        PluralAttributeMapping pluralAttributeMapping = (PluralAttributeMapping) attributeMapping;
+                        if (pluralAttributeMapping.getSeparateCollectionTable() != null) {
+                            pluralAttributeMappings.add( pluralAttributeMapping );
+                        }
+                    } else if ( attributeMapping instanceof EmbeddedAttributeMapping ) {
+                        collectCollectionTables(
+                                (EmbeddedAttributeMapping) attributeMapping,
+                                pluralAttributeMappings
+                        );
+                    }
+                }
+        );
+    }
+
+    private static void collectCollectionTables(EmbeddedAttributeMapping attributeMapping, List<PluralAttributeMapping> pluralAttributeMappings) {
+        attributeMapping.visitSubParts(
+                modelPart -> {
+                    if ( modelPart instanceof PluralAttributeMapping ) {
+                        PluralAttributeMapping pluralAttributeMapping = (PluralAttributeMapping) attributeMapping;
+                        if (pluralAttributeMapping.getSeparateCollectionTable() != null) {
+                            pluralAttributeMappings.add( pluralAttributeMapping );
+                        }
+                    } else if ( modelPart instanceof EmbeddedAttributeMapping ) {
+                        collectCollectionTables(
+                                (EmbeddedAttributeMapping) modelPart,
+                                pluralAttributeMappings
+                        );
+                    }
+                },
+                null
+        );
+    }
+
     @Override
     public String getSqlAlias(EntityManager em, Query query, String alias, int queryPartNumber) {
         QuerySqmImpl<?> hqlQuery = query.unwrap(QuerySqmImpl.class);
@@ -282,6 +453,7 @@ public String getSqlAlias(EntityManager em, Query query, String alias, int query
         NavigablePath navigablePath = findNavigablePath(alias, querySpec);
 
         CacheableSqmInterpretation interpretation = buildQuerySpecPlan(query);
+        interpretation.domainParameterXref.clearExpansions();
         TableGroup tableGroup = getTableGroup(interpretation, navigablePath);
         return tableGroup.getPrimaryTableReference().getIdentificationVariable();
     }
@@ -311,12 +483,7 @@ public SqlFromInfo getSqlFromInfo(EntityManager em, Query query, String alias, i
         // Note that it is important, this interpretation does not come from a cache,
         // otherwise bad things will happen due to this mutation
         primaryTableReference.setPrunedTableExpression(primaryTableReference.getTableId() + "/**/");
-        String sql;
-        try {
-            sql = getJdbcOperation(sfi, interpretation, hqlQuery).getSqlString();
-        } finally {
-            interpretation.domainParameterXref.clearExpansions();
-        }
+        String sql = getJdbcOperation(sfi, interpretation, hqlQuery).getSqlString();
         int startIndex = sql.indexOf(fakeFromText);
         int endIndex = startIndex + fromText.length();
         return new SqlFromInfo() {
@@ -515,7 +682,8 @@ private List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceP
         final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl(0);
         for (Query participatingQuery : participatingQueries) {
             CacheableSqmInterpretation interpretation = buildQueryPlan(participatingQuery);
-            JdbcOperationQuery jdbcOperation = getJdbcOperation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcTranslation translation = getJdbcTranslation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcOperationQuery jdbcOperation = translation.query;
             if (query == participatingQuery) {
                 // Don't copy over the limit and offset parameters because we need to use the LimitHandler for now
                 JdbcOperationQuerySelect select = (JdbcOperationQuerySelect) jdbcOperation;
@@ -529,26 +697,7 @@ private List getResultList(com.blazebit.persistence.spi.ServiceProvider serviceP
             }
             affectedTableNames.addAll(jdbcOperation.getAffectedTableNames());
             filterJdbcParameters.addAll(jdbcOperation.getFilterJdbcParameters());
-            final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref = SqmUtil.generateJdbcParamsXref(
-                    interpretation.domainParameterXref,
-                    interpretation.getSqmTranslation()::getJdbcParamsBySqmParam
-            );
-
-            final JdbcParameterBindings tempJdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
-                    participatingQuery.unwrap(QuerySqmImpl.class).getQueryParameterBindings(),
-                    interpretation.domainParameterXref,
-                    jdbcParamsXref,
-                    session.getFactory().getRuntimeMetamodels().getMappingMetamodel(),
-                    interpretation.tableGroupAccess::findTableGroup,
-                    new SqmParameterMappingModelResolutionAccess() {
-                        @Override
-                        @SuppressWarnings("unchecked")
-                        public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T> parameter) {
-                            return (MappingModelExpressible<T>) interpretation.sqmTranslation.getSqmParameterMappingModelTypeResolutions().get(parameter);
-                        }
-                    },
-                    session
-            );
+            final JdbcParameterBindings tempJdbcParameterBindings = translation.parameterBindings;
             if (!tempJdbcParameterBindings.getBindings().isEmpty()) {
                 tempJdbcParameterBindings.visitBindings(jdbcParameterBindings::addBinding);
             }
@@ -634,30 +783,12 @@ private Object getResultStream(com.blazebit.persistence.spi.ServiceProvider serv
         final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl(0);
         for (Query participatingQuery : participatingQueries) {
             CacheableSqmInterpretation interpretation = buildQueryPlan(participatingQuery);
-            JdbcOperationQuery jdbcOperation = getJdbcOperation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcTranslation translation = getJdbcTranslation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcOperationQuery jdbcOperation = translation.query;
             parameterBinders.addAll(jdbcOperation.getParameterBinders());
             affectedTableNames.addAll(jdbcOperation.getAffectedTableNames());
             filterJdbcParameters.addAll(jdbcOperation.getFilterJdbcParameters());
-            final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref = SqmUtil.generateJdbcParamsXref(
-                    interpretation.domainParameterXref,
-                    interpretation.getSqmTranslation()::getJdbcParamsBySqmParam
-            );
-
-            final JdbcParameterBindings tempJdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
-                    executionContext.getQueryParameterBindings(),
-                    interpretation.domainParameterXref,
-                    jdbcParamsXref,
-                    session.getFactory().getRuntimeMetamodels().getMappingMetamodel(),
-                    interpretation.tableGroupAccess::findTableGroup,
-                    new SqmParameterMappingModelResolutionAccess() {
-                        @Override
-                        @SuppressWarnings("unchecked")
-                        public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T> parameter) {
-                            return (MappingModelExpressible<T>) interpretation.sqmTranslation.getSqmParameterMappingModelTypeResolutions().get(parameter);
-                        }
-                    },
-                    session
-            );
+            final JdbcParameterBindings tempJdbcParameterBindings = translation.parameterBindings;
             if (!tempJdbcParameterBindings.getBindings().isEmpty()) {
                 tempJdbcParameterBindings.visitBindings(jdbcParameterBindings::addBinding);
             }
@@ -879,30 +1010,12 @@ public int executeUpdate(com.blazebit.persistence.spi.ServiceProvider servicePro
         final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl(0);
         for (Query participatingQuery : participatingQueries) {
             CacheableSqmInterpretation interpretation = buildQueryPlan(participatingQuery);
-            JdbcOperationQuery jdbcOperation = getJdbcOperation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcTranslation translation = getJdbcTranslation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcOperationQuery jdbcOperation = translation.query;
             parameterBinders.addAll(jdbcOperation.getParameterBinders());
             affectedTableNames.addAll(jdbcOperation.getAffectedTableNames());
             filterJdbcParameters.addAll(jdbcOperation.getFilterJdbcParameters());
-            final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref = SqmUtil.generateJdbcParamsXref(
-                    interpretation.domainParameterXref,
-                    interpretation.getSqmTranslation()::getJdbcParamsBySqmParam
-            );
-
-            final JdbcParameterBindings tempJdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
-                    participatingQuery.unwrap(DomainQueryExecutionContext.class).getQueryParameterBindings(),
-                    interpretation.domainParameterXref,
-                    jdbcParamsXref,
-                    session.getFactory().getRuntimeMetamodels().getMappingMetamodel(),
-                    interpretation.tableGroupAccess::findTableGroup,
-                    new SqmParameterMappingModelResolutionAccess() {
-                        @Override
-                        @SuppressWarnings("unchecked")
-                        public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T> parameter) {
-                            return (MappingModelExpressible<T>) interpretation.sqmTranslation.getSqmParameterMappingModelTypeResolutions().get(parameter);
-                        }
-                    },
-                    session
-            );
+            final JdbcParameterBindings tempJdbcParameterBindings = translation.parameterBindings;
             if (!tempJdbcParameterBindings.getBindings().isEmpty()) {
                 tempJdbcParameterBindings.visitBindings(jdbcParameterBindings::addBinding);
             }
@@ -987,44 +1100,21 @@ public ReturningResult<Object[]> executeReturning(com.blazebit.persistence.spi.S
         final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl(0);
         for (Query participatingQuery : participatingQueries) {
             CacheableSqmInterpretation interpretation = buildQueryPlan(participatingQuery);
-            JdbcOperationQuery jdbcOperation = getJdbcOperation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcTranslation translation = getJdbcTranslation(sessionFactory, interpretation, participatingQuery.unwrap(QuerySqmImpl.class));
+            JdbcOperationQuery jdbcOperation = translation.query;
             // Exclude limit/offset parameters from example query
             if (participatingQuery != exampleQuery) {
                 parameterBinders.addAll(jdbcOperation.getParameterBinders());
             }
             affectedTableNames.addAll(jdbcOperation.getAffectedTableNames());
             filterJdbcParameters.addAll(jdbcOperation.getFilterJdbcParameters());
-            final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref = SqmUtil.generateJdbcParamsXref(
-                    interpretation.domainParameterXref,
-                    interpretation.getSqmTranslation()::getJdbcParamsBySqmParam
-            );
 
-            final JdbcParameterBindings tempJdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
-                    participatingQuery.unwrap(DomainQueryExecutionContext.class).getQueryParameterBindings(),
-                    interpretation.domainParameterXref,
-                    jdbcParamsXref,
-                    session.getFactory().getRuntimeMetamodels().getMappingMetamodel(),
-                    interpretation.tableGroupAccess::findTableGroup,
-                    new SqmParameterMappingModelResolutionAccess() {
-                        @Override
-                        @SuppressWarnings("unchecked")
-                        public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T> parameter) {
-                            return (MappingModelExpressible<T>) interpretation.sqmTranslation.getSqmParameterMappingModelTypeResolutions().get(parameter);
-                        }
-                    },
-                    session
-            );
+            final JdbcParameterBindings tempJdbcParameterBindings = translation.parameterBindings;
             if (!tempJdbcParameterBindings.getBindings().isEmpty()) {
                 tempJdbcParameterBindings.visitBindings(jdbcParameterBindings::addBinding);
             }
         }
 
-        // Create combined query parameters
-        //        List<String> queryStrings = new ArrayList<>(participatingQueries.size());
-        //        Set<String> querySpaces = new HashSet<>();
-        //        QueryParamEntry queryParametersEntry = createQueryParameters(em, participatingQueries, queryStrings, querySpaces);
-        //        QueryParameters queryParameters = queryParametersEntry.queryParameters;
-
         // Create plan for example query
         JdbcOperationQuerySelect exampleQueryJdbcOperation = (JdbcOperationQuerySelect) getJdbcOperation(exampleQuery);
 
@@ -1038,37 +1128,12 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 
         try {
             HibernateReturningResult<Object[]> returningResult = new HibernateReturningResult<Object[]>();
-            //            if (!queryPlanEntry.isFromCache()) {
-            //                prepareQueryPlan(queryPlan, queryParametersEntry.specifications, finalSql, session, modificationBaseQuery, true, dbmsDialect);
-            //                queryPlan = putQueryPlanIfAbsent(sfi, cacheKey, queryPlan);
-            //            }
-            //
-            //            if (queryPlan.getTranslators().length > 1) {
-            //                throw new IllegalArgumentException("No support for multiple translators yet!");
-            //            }
-            //
-            //            QueryTranslator queryTranslator = queryPlan.getTranslators()[0];
-            //
-            //            // If the DBMS doesn't support inclusion of cascading deletes in a with clause, we have to execute them manually
-            //            StatementExecutor executor = getExecutor(queryTranslator, session, modificationBaseQuery);
-            //            List<String> originalDeletes = Collections.emptyList();
-            //
-            //            if (executor != null && executor instanceof DeleteExecutor) {
-            //                originalDeletes = getField(executor, "deletes");
-            //            }
-            //
-            //            // Extract query loader for native listing
-            //            QueryLoader queryLoader = getField(queryTranslator, "queryLoader");
 
             // Do the native list operation with custom session and combined parameters
 
             /*
              * NATIVE LIST START
              */
-            //            hibernateAccess.checkTransactionSynchStatus(session);
-            //            queryParameters.validateParameters();
-            //            autoFlush(querySpaces, session);
-
             List<Object[]> results = Collections.EMPTY_LIST;
             boolean success = false;
 
@@ -1078,7 +1143,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
             final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator(sessionFactory, (SelectStatement) interpretation.getSqmTranslation().getSqlAst())
                     .translate(jdbcParameterBindings, domainQueryExecutionContext.getQueryOptions());
             final JdbcOperationQuerySelect realJdbcSelect = new JdbcOperationQuerySelect(
-                    sqlOverride,
+                    finalSql,
                     parameterBinders,
                     jdbcSelect.getJdbcValuesMappingProducer(),
                     affectedTableNames,
@@ -1101,55 +1166,64 @@ public boolean hasQueryExecutionToBeAddedToStatistics() {
                     return true;
                 }
             };
-//            ExecutionContext executionContext = new ExecutionContext() {
-//                @Override
-//                public SharedSessionContractImplementor getSession() {
-//                    return domainQueryExecutionContext.getSession();
-//                }
-//
-//                @Override
-//                public QueryOptions getQueryOptions() {
-//                    return domainQueryExecutionContext.getQueryOptions();
-//                }
-//
-//                @Override
-//                public QueryParameterBindings getQueryParameterBindings() {
-//                    return domainQueryExecutionContext.getQueryParameterBindings();
-//                }
-//
-//                @Override
-//                public Callback getCallback() {
-//                    return domainQueryExecutionContext.getCallback();
-//                }
-//
-//                @Override
-//                public String getQueryIdentifier(String sql) {
-//                    return sql;
-//                }
-//
-//                @Override
-//                public boolean hasQueryExecutionToBeAddedToStatistics() {
-//                    return true;
-//                }
-//            };
-
-            // todo: to get subselect fetching work, we need a slight API change in Hibernate because we need to inject our sql override somehow
-            //        final SubselectFetch.RegistrationHandler subSelectFetchKeyHandler = SubselectFetch.createRegistrationHandler(
-            //                session.getPersistenceContext().getBatchFetchQueue(),
-            //                sqmInterpretation.selectStatement,
-            //                Collections.emptyList(),
-            //                jdbcParameterBindings
-            //        );
 
             session.autoFlushIfRequired(realJdbcSelect.getAffectedTableNames());
 
             try {
-                final SubselectFetch.RegistrationHandler subSelectFetchKeyHandler = SubselectFetch.createRegistrationHandler(
-                        session.getPersistenceContext().getBatchFetchQueue(),
-                        (SelectStatement) interpretation.sqmTranslation.getSqlAst(),
-                        JdbcParametersList.empty(),
-                        jdbcParameterBindings
-                );
+                if (modificationBaseQuery != null) {
+                    QuerySqmImpl<?> querySqm = modificationBaseQuery.unwrap(QuerySqmImpl.class);
+                    SqmStatement<?> modificationSqmStatement = querySqm.getSqmStatement();
+                    if (modificationSqmStatement instanceof SqmDmlStatement<?>) {
+                        SqmDmlStatement<?> sqmDmlStatement = (SqmDmlStatement<?>) modificationSqmStatement;
+                        BulkOperationCleanupAction.schedule(executionContext.getSession(), sqmDmlStatement);
+                        if (sqmDmlStatement instanceof SqmDeleteStatement<?> && !dbmsDialect.supportsModificationQueryInWithClause()) {
+                            CollectionTableDeleteInfo collectionTableDeletes = getCollectionTableDeletes(querySqm);
+                            List<JdbcOperationQueryMutation> deletes;
+                            int withIndex;
+                            if ((withIndex = finalSql.indexOf("with ")) != -1) {
+                                int end = getCTEEnd(finalSql, withIndex);
+
+                                int maxLength = 0;
+
+                                for (JdbcOperationQueryMutation delete : collectionTableDeletes.deletes) {
+                                    maxLength = Math.max(maxLength, delete.getSqlString().length());
+                                }
+
+                                deletes = new ArrayList<>(collectionTableDeletes.deletes.size());
+                                StringBuilder newSb = new StringBuilder(end + maxLength);
+                                // Prefix properly with cte
+                                StringBuilder withClauseSb = new StringBuilder(end - withIndex);
+                                withClauseSb.append(finalSql, withIndex, end);
+
+                                for (JdbcOperationQueryMutation delete : collectionTableDeletes.deletes) {
+                                    // TODO: The strings should also receive the simple CTE name instead of the complex one
+                                    newSb.append(delete.getSqlString());
+                                    dbmsDialect.appendExtendedSql(newSb, DbmsStatementType.DELETE, false, false, withClauseSb, null, null, null, null, null);
+                                    deletes.add(new JdbcOperationQueryDelete(newSb.toString(), delete.getParameterBinders(), delete.getAffectedTableNames(), delete.getAppliedParameters()));
+                                    newSb.setLength(0);
+                                }
+                            } else {
+                                deletes = collectionTableDeletes.deletes;
+                            }
+
+                            Function<String, PreparedStatement> statementCreator = sql -> session.getJdbcCoordinator()
+                                    .getStatementPreparer()
+                                    .prepareStatement(sql);
+                            BiConsumer<Integer, PreparedStatement> expectationCheck = (integer, preparedStatement) -> { };
+                            SqmJdbcExecutionContextAdapter executionContextAdapter = SqmJdbcExecutionContextAdapter.usingLockingAndPaging(
+                                    modificationBaseQuery.unwrap(DomainQueryExecutionContext.class));
+                            for (JdbcOperationQueryMutation delete : deletes) {
+                                session.getFactory().getJdbcServices().getJdbcMutationExecutor().execute(
+                                        delete,
+                                        collectionTableDeletes.parameterBindings,
+                                        statementCreator,
+                                        expectationCheck,
+                                        executionContextAdapter
+                                );
+                            }
+                        }
+                    }
+                }
 
                 results = session.getFactory().getJdbcServices().getJdbcSelectExecutor().list(
                         realJdbcSelect,
@@ -1159,7 +1233,7 @@ public boolean hasQueryExecutionToBeAddedToStatistics() {
                         ListResultsConsumer.UniqueSemantic.FILTER
                 );
             } catch (HibernateException e) {
-                LOG.severe("Could not execute the following SQL query: " + sqlOverride);
+                LOG.severe("Could not execute the following SQL query: " + finalSql);
                 if (session.getFactory().getSessionFactoryOptions().isJpaBootstrap()) {
                     throw session.getExceptionConverter().convert(e);
                 } else {
@@ -1168,23 +1242,6 @@ public boolean hasQueryExecutionToBeAddedToStatistics() {
             } finally {
                 interpretation.domainParameterXref.clearExpansions();
             }
-//            try {
-//                //                for (String delete : originalDeletes) {
-//                //                    hibernateAccess.doExecute(executor, delete, queryParameters, session, queryParametersEntry.specifications);
-//                //                }
-//                results = getResultList(serviceProvider, participatingQueries, exampleQuery, finalSql, queryPlanCacheEnabled, hibernateAccess.wrapExecutionContext(exampleQuery, dbmsDialect, returningColumnTypes, returningResult));
-//                //                results = hibernateAccess.list(queryLoader, wrapSession(session, dbmsDialect, returningColumns, returningColumnTypes, returningResult), queryParameters);
-//                success = true;
-//            } catch (HibernateException e) {
-//                LOG.severe("Could not execute the following SQL query: " + sqlOverride);
-//                if (session.getFactory().getSessionFactoryOptions().isJpaBootstrap()) {
-//                    throw session.getExceptionConverter().convert(e);
-//                } else {
-//                    throw e;
-//                }
-//            } finally {
-//                //                hibernateAccess.afterTransaction(session, success);
-//            }
             /*
              * NATIVE LIST END
              */
@@ -1196,6 +1253,38 @@ public boolean hasQueryExecutionToBeAddedToStatistics() {
         }
     }
 
+    private int getCTEEnd(String sql, int start) {
+        int parenthesis = 0;
+        QuoteMode mode = QuoteMode.NONE;
+        boolean started = false;
+
+        int i = start;
+        int end = sql.length();
+        OUTER: while (i < end) {
+            final char c = sql.charAt(i);
+            mode = mode.onChar(c);
+
+            if (mode == QuoteMode.NONE) {
+                if (c == '(') {
+                    started = true;
+                    parenthesis++;
+                } else if (c == ')') {
+                    parenthesis--;
+                } else if (started && parenthesis == 0 && c != ',' && !Character.isWhitespace(c)) {
+                    for (String statementType : KNOWN_STATEMENTS) {
+                        if (sql.regionMatches(true, i, statementType, 0, statementType.length())) {
+                            break OUTER;
+                        }
+                    }
+                }
+            }
+
+            i++;
+        }
+
+        return i;
+    }
+
     private static String[][] getReturningColumns(boolean caseInsensitive, String exampleQuerySql) {
         int fromIndex = exampleQuerySql.indexOf("from");
         int selectIndex = exampleQuerySql.indexOf("select");
@@ -1314,10 +1403,25 @@ private JdbcOperationQuery getJdbcOperation(Query query) {
 //            JdbcSelect jdbcSelect = getField(cacheableSqmInterpretation, "jdbcSelect");
 //            return jdbcSelect;
 //        }
-        return getJdbcOperation(factory, buildQueryPlan(query), hqlQuery);
+        CacheableSqmInterpretation interpretation = buildQueryPlan( query );
+        return getJdbcOperation( factory, interpretation, hqlQuery );
     }
 
     private JdbcOperationQuery getJdbcOperation(SessionFactoryImplementor factory, CacheableSqmInterpretation interpretation, QuerySqmImpl<?> query) {
+        return getJdbcTranslation( factory, interpretation, query ).query;
+    }
+
+    private static class JdbcTranslation {
+        private final JdbcOperationQuery query;
+        private final JdbcParameterBindings parameterBindings;
+
+        public JdbcTranslation(JdbcOperationQuery query, JdbcParameterBindings parameterBindings) {
+            this.query = query;
+            this.parameterBindings = parameterBindings;
+        }
+    }
+
+    private JdbcTranslation getJdbcTranslation(SessionFactoryImplementor factory, CacheableSqmInterpretation interpretation, QuerySqmImpl<?> query) {
         JdbcEnvironment jdbcEnvironment = factory.getJdbcServices().getJdbcEnvironment();
         SqlAstTranslatorFactory sqlAstTranslatorFactory = jdbcEnvironment.getSqlAstTranslatorFactory();
         SqmTranslation<?> sqmTranslation = interpretation.getSqmTranslation();
@@ -1342,19 +1446,20 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
                 },
                 query.getSession()
         );
+        interpretation.domainParameterXref.clearExpansions();
 
         if (sqlAst instanceof SelectStatement) {
             SqlAstTranslator<JdbcOperationQuerySelect> translator = sqlAstTranslatorFactory.buildSelectTranslator(factory, (SelectStatement) sqlAst);
-            return translator.translate(jdbcParameterBindings, query.getQueryOptions());
+            return new JdbcTranslation(translator.translate(jdbcParameterBindings, query.getQueryOptions()), jdbcParameterBindings);
         } else if (sqlAst instanceof DeleteStatement) {
             SqlAstTranslator<JdbcOperationQueryDelete> translator = sqlAstTranslatorFactory.buildDeleteTranslator(factory, (DeleteStatement) sqlAst);
-            return translator.translate(jdbcParameterBindings, query.getQueryOptions());
+            return new JdbcTranslation(translator.translate(jdbcParameterBindings, query.getQueryOptions()), jdbcParameterBindings);
         } else if (sqlAst instanceof UpdateStatement) {
             SqlAstTranslator<JdbcOperationQueryUpdate> translator = sqlAstTranslatorFactory.buildUpdateTranslator(factory, (UpdateStatement) sqlAst);
-            return translator.translate(jdbcParameterBindings, query.getQueryOptions());
+            return new JdbcTranslation(translator.translate(jdbcParameterBindings, query.getQueryOptions()), jdbcParameterBindings);
         } else if (sqlAst instanceof InsertStatement) {
             SqlAstTranslator<JdbcOperationQueryInsert> translator = sqlAstTranslatorFactory.buildInsertTranslator(factory, (InsertStatement) sqlAst);
-            return translator.translate(jdbcParameterBindings, query.getQueryOptions());
+            return new JdbcTranslation(translator.translate(jdbcParameterBindings, query.getQueryOptions()), jdbcParameterBindings);
         }
         throw new UnsupportedOperationException();
     }
diff --git a/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java b/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java
index 9f67519a3e..2d5ae35992 100644
--- a/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java
+++ b/integration/hibernate6-base/src/main/java/com/blazebit/persistence/integration/hibernate/base/HibernateJpaProvider.java
@@ -129,11 +129,6 @@ public boolean supportsForeignAssociationInOnClause() {
         return true;
     }
 
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
     @Override
     public boolean needsBrokenAssociationToIdRewriteInOnClause() {
         return false;
@@ -1636,7 +1631,7 @@ public Object getIdentifier(Object entity) {
         if (entity instanceof HibernateProxy) {
             return ((HibernateProxy) entity).getHibernateLazyInitializer().getIdentifier();
         }
-        return persistenceUnitUtil.getIdentifier(entity);
+        return entity == null ? null : persistenceUnitUtil.getIdentifier(entity);
     }
 
     @Override
diff --git a/integration/hibernate6-base/src/main/java/module-info.java b/integration/hibernate6-base/src/main/java/module-info.java
new file mode 100644
index 0000000000..4d141a8211
--- /dev/null
+++ b/integration/hibernate6-base/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.hibernate.base {
+	requires org.hibernate.orm.core;
+	requires java.naming;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.integration.jpa;
+	requires com.blazebit.persistence.core;
+	exports com.blazebit.persistence.integration.hibernate.base;
+	exports com.blazebit.persistence.integration.hibernate.base.spi;
+	exports com.blazebit.persistence.integration.hibernate.base.function;
+	uses com.blazebit.persistence.integration.hibernate.base.HibernateAccess;
+	uses com.blazebit.persistence.integration.hibernate.base.spi.HibernateVersionProvider;
+	provides com.blazebit.persistence.spi.ExtendedQuerySupport with com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport;
+}
\ No newline at end of file
diff --git a/integration/hibernate6-base/src/main/resources/META-INF/services/com.blazebit.persistence.spi.ExtendedQuerySupport b/integration/hibernate6-base/src/main/resources/META-INF/services/com.blazebit.persistence.spi.ExtendedQuerySupport
new file mode 100644
index 0000000000..bebeb702b3
--- /dev/null
+++ b/integration/hibernate6-base/src/main/resources/META-INF/services/com.blazebit.persistence.spi.ExtendedQuerySupport
@@ -0,0 +1 @@
+com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport
diff --git a/integration/jackson-jakarta/pom.xml b/integration/jackson-jakarta/pom.xml
deleted file mode 100644
index 17fbc5d934..0000000000
--- a/integration/jackson-jakarta/pom.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jackson</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-jackson:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jackson:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jackson:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jackson/pom.xml b/integration/jackson/pom.xml
index a41af1ef2d..1046ad3160 100644
--- a/integration/jackson/pom.xml
+++ b/integration/jackson/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -32,9 +31,28 @@
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -48,14 +66,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.4}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-apt}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -68,28 +86,11 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.integration.jackson;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/integration/jackson/src/main/java/module-info.java b/integration/jackson/src/main/java/module-info.java
new file mode 100644
index 0000000000..83c91e0412
--- /dev/null
+++ b/integration/jackson/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jackson {
+	requires transitive com.blazebit.persistence.view;
+	requires com.blazebit.common.utils;
+	requires com.fasterxml.jackson.annotation;
+	requires com.fasterxml.jackson.databind;
+	requires com.fasterxml.jackson.core;
+	exports com.blazebit.persistence.integration.jackson;
+}
\ No newline at end of file
diff --git a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/EntityViewAwareObjectMapperTest.java b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/EntityViewAwareObjectMapperTest.java
index 2be707b511..172af504ce 100644
--- a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/EntityViewAwareObjectMapperTest.java
+++ b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/EntityViewAwareObjectMapperTest.java
@@ -26,8 +26,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
diff --git a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/SomeEntity.java b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/SomeEntity.java
index 28c90479c6..11386e5c99 100644
--- a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/SomeEntity.java
+++ b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/SomeEntity.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.integration.jackson;
 
-import javax.persistence.Basic;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import java.util.List;
 import java.util.Set;
 
diff --git a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/StringListConverter.java b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/StringListConverter.java
index c4fcbf4b55..30e4269a30 100644
--- a/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/StringListConverter.java
+++ b/integration/jackson/src/test/java/com/blazebit/persistence/integration/jackson/StringListConverter.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.integration.jackson;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/integration/jaxrs-jackson-jakarta/pom.xml b/integration/jaxrs-jackson-jakarta/pom.xml
deleted file mode 100644
index 7a1cec10cb..0000000000
--- a/integration/jaxrs-jackson-jakarta/pom.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jaxrs.jackson</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-jaxrs-jackson:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jaxrs-jackson:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jaxrs-jackson:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jaxrs-jackson/pom.xml b/integration/jaxrs-jackson/pom.xml
index 74d18adbd8..4a70cbe6fb 100644
--- a/integration/jaxrs-jackson/pom.xml
+++ b/integration/jaxrs-jackson/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,16 +14,15 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.jaxrs.jackson</module.name>
+        <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
+
         <!-- Don't test compiling to newer classfile versions to avoid having to deal with Jersey updates -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <version.deltaspike>1.9.3</version.deltaspike>
-        <version.hibernate>5.4.6.Final</version.hibernate>
-        <version.integration-hibernate>5.4</version.integration-hibernate>
-        <version.jersey>2.30.1</version.jersey>
-        <version.jackson>2.9.8</version.jackson>
-        <version.jaxrs>2.1.1</version.jaxrs>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
+        <version.jersey>3.1.9</version.jersey>
     </properties>
 
     <dependencyManagement>
@@ -39,6 +38,31 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
@@ -46,7 +70,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${version.jackson}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -61,12 +84,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>${version.jaxrs}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-common</artifactId>
@@ -75,28 +92,10 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>2.0.SP1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${version.jackson}</version>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -121,12 +120,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-${version.integration-hibernate}</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${version.hibernate}</version>
             <scope>test</scope>
         </dependency>
@@ -152,16 +151,6 @@
             <artifactId>jersey-cdi2-se</artifactId>
             <version>${version.jersey}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -192,36 +181,12 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.integration.jackson;
-                                        exports com.blazebit.persistence.integration.jaxrs;
-                                        provides org.glassfish.jersey.model.internal.spi.ParameterServiceProvider with com.blazebit.persistence.integration.jaxrs.jackson.jersey.EntityViewIdAwareParameterServiceProvider;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
                     <excludedGroups>
                         com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate
                     </excludedGroups>
@@ -237,16 +202,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>post-10-unsafe-code</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/EntityViewMessageBodyReader.java b/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/EntityViewMessageBodyReader.java
index 1d33312b28..f41cbc0cbf 100644
--- a/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/EntityViewMessageBodyReader.java
+++ b/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/EntityViewMessageBodyReader.java
@@ -23,26 +23,26 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Priorities;
-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.UriInfo;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.Providers;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Priorities;
+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.UriInfo;
+import jakarta.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Providers;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -172,7 +172,7 @@ public Object readFrom(Class<Object> type, Type genericType, Annotation[] annota
     }
 
     /**
-     * Copy of {@link com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider#hasMatchingMediaType(javax.ws.rs.core.MediaType)}
+     * Copy of {@link com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider#hasMatchingMediaType(jakarta.ws.rs.core.MediaType)}
      *
      * @param mediaType the media type to be matched
      * @return true, if this reader accepts the given mediaType or false otherwise
@@ -282,7 +282,7 @@ public <T> ParamConverter<T> getConverter(Class<T> clazz, Type type, Annotation[
          *
          * @param <T> The parameter type
          */
-        private static class MethodBasedParamConverter<T> implements javax.ws.rs.ext.ParamConverter<T> {
+        private static class MethodBasedParamConverter<T> implements jakarta.ws.rs.ext.ParamConverter<T> {
             private final Method stringConsumingMethod;
 
             public MethodBasedParamConverter(Method stringConsumingMethod) {
@@ -310,7 +310,7 @@ public String toString(T o) {
          *
          * @param <T> The parameter type
          */
-        private static class ConstructorBasedParamConverter<T> implements javax.ws.rs.ext.ParamConverter<T> {
+        private static class ConstructorBasedParamConverter<T> implements jakarta.ws.rs.ext.ParamConverter<T> {
             private final Constructor<T> stringConstructor;
 
             public ConstructorBasedParamConverter(Constructor<T> stringConstructor) {
@@ -336,7 +336,7 @@ public String toString(T o) {
         /**
          * ParamConverter for default parameter conversion for {@link java.lang.Character}
          */
-        private static class CharacterParamConverter implements javax.ws.rs.ext.ParamConverter<Character> {
+        private static class CharacterParamConverter implements jakarta.ws.rs.ext.ParamConverter<Character> {
 
             @Override
             @SuppressWarnings("unchecked")
diff --git a/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/jersey/EntityViewIdAwareParameterServiceProvider.java b/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/jersey/EntityViewIdAwareParameterServiceProvider.java
deleted file mode 100644
index 49b1f05171..0000000000
--- a/integration/jaxrs-jackson/src/main/java/com/blazebit/persistence/integration/jaxrs/jackson/jersey/EntityViewIdAwareParameterServiceProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.jaxrs.jackson.jersey;
-
-import com.blazebit.persistence.integration.jaxrs.EntityViewId;
-import org.glassfish.jersey.model.internal.spi.ParameterServiceProvider;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class EntityViewIdAwareParameterServiceProvider implements ParameterServiceProvider {
-    @Override
-    public Map<Class, Parameter.ParamAnnotationHelper> getParameterAnnotationHelperMap() {
-        Map<Class, org.glassfish.jersey.model.Parameter.ParamAnnotationHelper> m = new WeakHashMap<>();
-        m.put(EntityViewId.class, new org.glassfish.jersey.model.Parameter.ParamAnnotationHelper<EntityViewId>() {
-            public String getValueOf(EntityViewId a) {
-                return a.value().isEmpty() ? a.name() : a.value();
-            }
-
-            public org.glassfish.jersey.model.Parameter.Source getSource() {
-                return org.glassfish.jersey.model.Parameter.Source.ENTITY;
-            }
-        });
-        return m;
-    }
-
-    @Override
-    public Parameter.ParamCreationFactory<? extends org.glassfish.jersey.model.Parameter> getParameterCreationFactory() {
-        return new org.glassfish.jersey.model.Parameter.ParamCreationFactory<org.glassfish.jersey.model.Parameter>() {
-            public boolean isFor(Class<?> clazz) {
-                return clazz == org.glassfish.jersey.model.Parameter.class;
-            }
-
-            public org.glassfish.jersey.model.Parameter createParameter(Annotation[] markers, Annotation marker, org.glassfish.jersey.model.Parameter.Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-                return new EntityViewIdAwareParameterServiceProvider.Parameter(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-            }
-
-            public org.glassfish.jersey.model.Parameter createBeanParameter(Annotation[] markers, Annotation marker, org.glassfish.jersey.model.Parameter.Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-                return this.createParameter(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-            }
-        };
-    }
-
-    /**
-     * Custom parameter implementation required because construtor of org.glassfish.jersey.model.Parameter is protected.
-     */
-    private static class Parameter extends org.glassfish.jersey.model.Parameter {
-
-        Parameter(Annotation[] markers, Annotation marker, Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-            super(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-        }
-    }
-}
diff --git a/integration/jaxrs-jackson/src/main/java/module-info.java b/integration/jaxrs-jackson/src/main/java/module-info.java
new file mode 100644
index 0000000000..53e5cb965c
--- /dev/null
+++ b/integration/jaxrs-jackson/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jaxrs.jackson {
+	requires transitive com.blazebit.persistence.view;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.integration.jackson;
+	requires com.blazebit.persistence.integration.jaxrs;
+	requires com.fasterxml.jackson.core;
+	requires com.fasterxml.jackson.databind;
+	requires jakarta.cdi;
+	requires jakarta.inject;
+	requires jakarta.ws.rs;
+	exports com.blazebit.persistence.integration.jaxrs.jackson;
+}
\ No newline at end of file
diff --git a/integration/jaxrs-jackson/src/main/resources/META-INF/beans.xml b/integration/jaxrs-jackson/src/main/resources/META-INF/beans.xml
index 1942d28594..e9eaf6401b 100644
--- a/integration/jaxrs-jackson/src/main/resources/META-INF/beans.xml
+++ b/integration/jaxrs-jackson/src/main/resources/META-INF/beans.xml
@@ -3,11 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans
-        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-        bean-discovery-mode="annotated"
-        version="1.1">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file
diff --git a/integration/jaxrs-jackson/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider b/integration/jaxrs-jackson/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider
deleted file mode 100644
index e3e5101a7e..0000000000
--- a/integration/jaxrs-jackson/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.jaxrs.jackson.jersey.EntityViewIdAwareParameterServiceProvider
\ No newline at end of file
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/AbstractJaxrsTest.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/AbstractJaxrsTest.java
index 479fe1a028..1d99f1035c 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/AbstractJaxrsTest.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/AbstractJaxrsTest.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import org.eclipse.jetty.server.Server;
 import org.glassfish.jersey.jetty.JettyHttpContainer;
 import org.glassfish.jersey.jetty.JettyHttpContainerFactory;
@@ -25,14 +25,14 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.UriBuilder;
 import java.net.BindException;
 import java.net.URI;
 import java.util.HashMap;
@@ -112,7 +112,7 @@ public static void shutdownContainer() throws Exception {
 
     @Before
     public void initInstance() {
-        ((JettyHttpContainer) SERVER.getHandler()).getApplicationHandler().getInjectionManager().inject(this);
+        ((JettyHttpContainer) (Object) SERVER.getHandler()).getApplicationHandler().getInjectionManager().inject(this);
         dropAndCreateSchema();
         this.webTarget = ClientBuilder.newClient()
                 .register(JacksonJsonProvider.class)
@@ -122,7 +122,7 @@ public void initInstance() {
 
     private void dropAndCreateSchema() {
         Map<String, String> properties = new HashMap<>();
-        properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
+        properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create");
         Persistence.createEntityManagerFactory("TestsuiteBase", properties);
     }
 
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/DocumentResourceTest.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/DocumentResourceTest.java
index bd77c53928..f95372641b 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/DocumentResourceTest.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/DocumentResourceTest.java
@@ -12,8 +12,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/FromStringParamConverterProviderTest.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/FromStringParamConverterProviderTest.java
index 5a37d30bb7..7b99bf7d5b 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/FromStringParamConverterProviderTest.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/FromStringParamConverterProviderTest.java
@@ -8,8 +8,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/PersonResourceTest.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/PersonResourceTest.java
index fda30a9a33..de94387ed8 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/PersonResourceTest.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/PersonResourceTest.java
@@ -11,9 +11,9 @@
 import com.blazebit.persistence.integration.jaxrs.jackson.testsuite.entity.Person;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import java.util.UUID;
 
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/CriteriaBuilderFactoryProducer.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/CriteriaBuilderFactoryProducer.java
index 56da77578b..678e6e1938 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/CriteriaBuilderFactoryProducer.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/CriteriaBuilderFactoryProducer.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerFactoryHolder.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerFactoryHolder.java
index 23701f00e0..bbbdf4ab1a 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerFactoryHolder.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerFactoryHolder.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.integration.jaxrs.jackson.testsuite.config;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly.
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerHolder.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerHolder.java
index 47bd5e4738..7804102ba3 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerHolder.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityManagerHolder.java
@@ -7,12 +7,12 @@
 
 import org.apache.deltaspike.jpa.api.transaction.TransactionScoped;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityViewManagerProducer.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityViewManagerProducer.java
index 198eb31b15..1ba735bb1b 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityViewManagerProducer.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/config/EntityViewManagerProducer.java
@@ -10,12 +10,12 @@
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Document.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Document.java
index a392e74790..328c63086c 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Document.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Document.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.jaxrs.jackson.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Person.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Person.java
index 0236064730..474b0d5d77 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Person.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/entity/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.integration.jaxrs.jackson.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/Application.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/Application.java
index 053a3ff58e..5263ce9542 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/Application.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/Application.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.jaxrs.jackson.testsuite.resource;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
 
-import javax.enterprise.inject.Alternative;
-import javax.ws.rs.ApplicationPath;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.ws.rs.ApplicationPath;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/DocumentResource.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/DocumentResource.java
index 6914ed8b03..402a3ed91d 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/DocumentResource.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/DocumentResource.java
@@ -12,13 +12,13 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Objects;
 
 /**
diff --git a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/PersonResource.java b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/PersonResource.java
index cd3b38a670..7b3482c090 100644
--- a/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/PersonResource.java
+++ b/integration/jaxrs-jackson/src/test/java/com/blazebit/persistence/integration/jaxrs/jackson/testsuite/resource/PersonResource.java
@@ -13,14 +13,14 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.net.URI;
 
 /**
diff --git a/integration/jaxrs-jackson/src/test/resources/META-INF/beans.xml b/integration/jaxrs-jackson/src/test/resources/META-INF/beans.xml
index dc74ca17f4..dc988397a1 100644
--- a/integration/jaxrs-jackson/src/test/resources/META-INF/beans.xml
+++ b/integration/jaxrs-jackson/src/test/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
 </beans>
\ No newline at end of file
diff --git a/integration/jaxrs-jackson/src/test/resources/META-INF/persistence.xml b/integration/jaxrs-jackson/src/test/resources/META-INF/persistence.xml
index ce4e1d60c9..692c121573 100644
--- a/integration/jaxrs-jackson/src/test/resources/META-INF/persistence.xml
+++ b/integration/jaxrs-jackson/src/test/resources/META-INF/persistence.xml
@@ -10,11 +10,11 @@
         <class>com.blazebit.persistence.integration.jaxrs.jackson.testsuite.entity.Person</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="user"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.sharedCache.mode" value="NONE"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
+            <property name="jakarta.persistence.jdbc.user" value="user"/>
+            <property name="jakarta.persistence.jdbc.password" value="password"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.sharedCache.mode" value="NONE"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integration/jaxrs-jsonb-jakarta/pom.xml b/integration/jaxrs-jsonb-jakarta/pom.xml
deleted file mode 100644
index 05bf58ff56..0000000000
--- a/integration/jaxrs-jsonb-jakarta/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jaxrs-jsonb-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jaxrs.jsonb</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jsonb</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-jaxrs-jsonb:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jaxrs-jsonb:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jaxrs-jsonb:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jaxrs-jsonb/pom.xml b/integration/jaxrs-jsonb/pom.xml
index 31ac2e96d3..ded9ca85ac 100644
--- a/integration/jaxrs-jsonb/pom.xml
+++ b/integration/jaxrs-jsonb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,15 +14,14 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.jaxrs.jsonb</module.name>
+        <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
+
         <!-- Don't test compiling to newer classfile versions to avoid having to deal with Jersey updates -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <version.deltaspike>1.9.3</version.deltaspike>
-        <version.hibernate>5.4.6.Final</version.hibernate>
-        <version.integration-hibernate>5.4</version.integration-hibernate>
-        <version.jersey>2.30.1</version.jersey>
-        <version.jaxrs>2.1.1</version.jaxrs>
+        <version.deltaspike>${version.deltaspike-2.0}</version.deltaspike>
+        <version.jersey>3.1.9</version.jersey>
     </properties>
 
     <dependencyManagement>
@@ -38,6 +37,31 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
@@ -45,13 +69,11 @@
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
-            <version>1.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
-            <version>1.1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -66,12 +88,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>${version.jaxrs}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-common</artifactId>
@@ -80,27 +96,10 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>2.0.SP1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>1.0.9</version>
+            <version>3.0.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -125,13 +124,13 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-${version.integration-hibernate}</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-apt}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -156,16 +155,6 @@
             <artifactId>jersey-cdi2-se</artifactId>
             <version>${version.jersey}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -196,37 +185,12 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires transitive com.blazebit.persistence.integration.jaxrs;
-                                        requires com.blazebit.common.utils;
-                                        requires com.blazebit.persistence.integration.jsonb;
-                                        exports com.blazebit.persistence.integration.jaxrs.jsonb;
-                                        provides org.glassfish.jersey.model.internal.spi.ParameterServiceProvider with com.blazebit.persistence.integration.jaxrs.jsonb.jersey.EntityViewIdAwareParameterServiceProvider;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
                     <excludedGroups>
                         com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate
                     </excludedGroups>
@@ -242,16 +206,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>post-10-unsafe-code</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/EntityViewMessageBodyReader.java b/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/EntityViewMessageBodyReader.java
index 07771ee041..1535cc8e89 100644
--- a/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/EntityViewMessageBodyReader.java
+++ b/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/EntityViewMessageBodyReader.java
@@ -19,31 +19,31 @@
 import com.blazebit.persistence.view.change.SingularChangeModel;
 import com.blazebit.persistence.view.metamodel.ViewMetamodel;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.serializer.DeserializationContext;
-import javax.json.stream.JsonParser;
-import javax.persistence.EntityManager;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Priorities;
-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.UriInfo;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.Providers;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.stream.JsonParser;
+import jakarta.persistence.EntityManager;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Priorities;
+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.UriInfo;
+import jakarta.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Providers;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -169,7 +169,7 @@ public Object readFrom(Class<Object> type, Type genericType, Annotation[] annota
     }
 
     /**
-     * Copy of {@link com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider#hasMatchingMediaType(javax.ws.rs.core.MediaType)}
+     * Copy of {@link com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider#hasMatchingMediaType(jakarta.ws.rs.core.MediaType)}
      *
      * @param mediaType the media type to be matched
      * @return true, if this reader accepts the given mediaType or false otherwise
@@ -279,7 +279,7 @@ public <T> ParamConverter<T> getConverter(Class<T> clazz, Type type, Annotation[
          *
          * @param <T> The parameter type
          */
-        private static class MethodBasedParamConverter<T> implements javax.ws.rs.ext.ParamConverter<T> {
+        private static class MethodBasedParamConverter<T> implements jakarta.ws.rs.ext.ParamConverter<T> {
             private final Method stringConsumingMethod;
 
             public MethodBasedParamConverter(Method stringConsumingMethod) {
@@ -307,7 +307,7 @@ public String toString(T o) {
          *
          * @param <T> The parameter type
          */
-        private static class ConstructorBasedParamConverter<T> implements javax.ws.rs.ext.ParamConverter<T> {
+        private static class ConstructorBasedParamConverter<T> implements jakarta.ws.rs.ext.ParamConverter<T> {
             private final Constructor<T> stringConstructor;
 
             public ConstructorBasedParamConverter(Constructor<T> stringConstructor) {
@@ -333,7 +333,7 @@ public String toString(T o) {
         /**
          * ParamConverter for default parameter conversion for {@link java.lang.Character}
          */
-        private static class CharacterParamConverter implements javax.ws.rs.ext.ParamConverter<Character> {
+        private static class CharacterParamConverter implements jakarta.ws.rs.ext.ParamConverter<Character> {
 
             @Override
             @SuppressWarnings("unchecked")
diff --git a/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/jersey/EntityViewIdAwareParameterServiceProvider.java b/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/jersey/EntityViewIdAwareParameterServiceProvider.java
deleted file mode 100644
index 4d829ec01a..0000000000
--- a/integration/jaxrs-jsonb/src/main/java/com/blazebit/persistence/integration/jaxrs/jsonb/jersey/EntityViewIdAwareParameterServiceProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.jaxrs.jsonb.jersey;
-
-import com.blazebit.persistence.integration.jaxrs.EntityViewId;
-import org.glassfish.jersey.model.internal.spi.ParameterServiceProvider;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class EntityViewIdAwareParameterServiceProvider implements ParameterServiceProvider {
-    @Override
-    public Map<Class, Parameter.ParamAnnotationHelper> getParameterAnnotationHelperMap() {
-        Map<Class, org.glassfish.jersey.model.Parameter.ParamAnnotationHelper> m = new WeakHashMap<>();
-        m.put(EntityViewId.class, new org.glassfish.jersey.model.Parameter.ParamAnnotationHelper<EntityViewId>() {
-            public String getValueOf(EntityViewId a) {
-                return a.value().isEmpty() ? a.name() : a.value();
-            }
-
-            public org.glassfish.jersey.model.Parameter.Source getSource() {
-                return org.glassfish.jersey.model.Parameter.Source.ENTITY;
-            }
-        });
-        return m;
-    }
-
-    @Override
-    public Parameter.ParamCreationFactory<? extends org.glassfish.jersey.model.Parameter> getParameterCreationFactory() {
-        return new org.glassfish.jersey.model.Parameter.ParamCreationFactory<org.glassfish.jersey.model.Parameter>() {
-            public boolean isFor(Class<?> clazz) {
-                return clazz == org.glassfish.jersey.model.Parameter.class;
-            }
-
-            public org.glassfish.jersey.model.Parameter createParameter(Annotation[] markers, Annotation marker, org.glassfish.jersey.model.Parameter.Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-                return new EntityViewIdAwareParameterServiceProvider.Parameter(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-            }
-
-            public org.glassfish.jersey.model.Parameter createBeanParameter(Annotation[] markers, Annotation marker, org.glassfish.jersey.model.Parameter.Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-                return this.createParameter(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-            }
-        };
-    }
-
-    /**
-     * Custom parameter implementation required because construtor of org.glassfish.jersey.model.Parameter is protected.
-     */
-    private static class Parameter extends org.glassfish.jersey.model.Parameter {
-
-        Parameter(Annotation[] markers, Annotation marker, Source source, String sourceName, Class<?> rawType, Type type, boolean encoded, String defaultValue) {
-            super(markers, marker, source, sourceName, rawType, type, encoded, defaultValue);
-        }
-    }
-}
diff --git a/integration/jaxrs-jsonb/src/main/java/module-info.java b/integration/jaxrs-jsonb/src/main/java/module-info.java
new file mode 100644
index 0000000000..093de60f2e
--- /dev/null
+++ b/integration/jaxrs-jsonb/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jaxrs.jsonb {
+	requires transitive com.blazebit.persistence.view;
+	requires transitive com.blazebit.persistence.integration.jaxrs;
+	requires com.blazebit.common.utils;
+	requires com.blazebit.persistence.integration.jsonb;
+	requires jakarta.cdi;
+	requires jakarta.inject;
+	requires jakarta.ws.rs;
+	requires jakarta.json.bind;
+	requires jakarta.json;
+	exports com.blazebit.persistence.integration.jaxrs.jsonb;
+}
\ No newline at end of file
diff --git a/integration/jaxrs-jsonb/src/main/resources/META-INF/beans.xml b/integration/jaxrs-jsonb/src/main/resources/META-INF/beans.xml
index 1942d28594..e9eaf6401b 100644
--- a/integration/jaxrs-jsonb/src/main/resources/META-INF/beans.xml
+++ b/integration/jaxrs-jsonb/src/main/resources/META-INF/beans.xml
@@ -3,11 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans
-        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-        bean-discovery-mode="annotated"
-        version="1.1">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file
diff --git a/integration/jaxrs-jsonb/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider b/integration/jaxrs-jsonb/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider
deleted file mode 100644
index 9c0a1362c7..0000000000
--- a/integration/jaxrs-jsonb/src/main/resources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.integration.jaxrs.jsonb.jersey.EntityViewIdAwareParameterServiceProvider
\ No newline at end of file
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/AbstractJaxrsTest.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/AbstractJaxrsTest.java
index e180bd6ea1..908bd40bef 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/AbstractJaxrsTest.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/AbstractJaxrsTest.java
@@ -20,18 +20,18 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import javax.inject.Inject;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.config.PropertyVisibilityStrategy;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
+import jakarta.json.bind.config.PropertyVisibilityStrategy;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.UriBuilder;
 import java.io.ByteArrayOutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -115,7 +115,7 @@ public static void shutdownContainer() throws Exception {
 
     @Before
     public void initInstance() {
-        ((JettyHttpContainer) SERVER.getHandler()).getApplicationHandler().getInjectionManager().inject(this);
+        ((JettyHttpContainer) (Object) SERVER.getHandler()).getApplicationHandler().getInjectionManager().inject(this);
         dropAndCreateSchema();
         this.webTarget = ClientBuilder.newClient()
                 .register(JsonbJsonProvider.class)
@@ -125,7 +125,7 @@ public void initInstance() {
 
     private void dropAndCreateSchema() {
         Map<String, String> properties = new HashMap<>();
-        properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
+        properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create");
         Persistence.createEntityManagerFactory("TestsuiteBase", properties);
     }
 
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/DocumentResourceTest.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/DocumentResourceTest.java
index 3b6b39c06f..6b28d3297c 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/DocumentResourceTest.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/DocumentResourceTest.java
@@ -11,8 +11,8 @@
 import com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.view.DocumentView;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/FromStringParamConverterProviderTest.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/FromStringParamConverterProviderTest.java
index 334d3a0e3e..99c5fcc73e 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/FromStringParamConverterProviderTest.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/FromStringParamConverterProviderTest.java
@@ -8,8 +8,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/JsonbJsonProvider.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/JsonbJsonProvider.java
index 80556e10e9..884851d860 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/JsonbJsonProvider.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/JsonbJsonProvider.java
@@ -4,18 +4,18 @@
  */
 package com.blazebit.persistence.integration.jaxrs.jsonb.testsuite;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/PersonResourceTest.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/PersonResourceTest.java
index 64b4d26443..3dc86cc1fc 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/PersonResourceTest.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/PersonResourceTest.java
@@ -11,9 +11,9 @@
 import com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.view.PersonView;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import java.util.UUID;
 
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/CriteriaBuilderFactoryProducer.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/CriteriaBuilderFactoryProducer.java
index 68139ebe0e..cccd38c872 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/CriteriaBuilderFactoryProducer.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/CriteriaBuilderFactoryProducer.java
@@ -9,13 +9,13 @@
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerFactoryHolder.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerFactoryHolder.java
index 717c63e646..d3628a62fc 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerFactoryHolder.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerFactoryHolder.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.config;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 /**
  * Workaround for WELD-2245 which prevents the use of @ApplicationScoped for EntityManagerFactory directly.
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerHolder.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerHolder.java
index 38fdd5a264..3aa4a58750 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerHolder.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityManagerHolder.java
@@ -7,12 +7,12 @@
 
 import org.apache.deltaspike.jpa.api.transaction.TransactionScoped;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityViewManagerProducer.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityViewManagerProducer.java
index bbba302091..9c1fcc01c3 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityViewManagerProducer.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/config/EntityViewManagerProducer.java
@@ -10,12 +10,12 @@
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.spi.type.TypeConverter;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Document.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Document.java
index e8490f2c04..c3dbbcbc2b 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Document.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Document.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Person.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Person.java
index 6e44b86469..d6d2879822 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Person.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/entity/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/Application.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/Application.java
index 44f5294d4d..7cf682eb50 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/Application.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/Application.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.JsonbJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
 
-import javax.enterprise.inject.Alternative;
-import javax.ws.rs.ApplicationPath;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.ws.rs.ApplicationPath;
 
 /**
  * @author Moritz Becker
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/DocumentResource.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/DocumentResource.java
index c26474d611..2fb31bcd8a 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/DocumentResource.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/DocumentResource.java
@@ -12,13 +12,13 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Objects;
 
 /**
diff --git a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/PersonResource.java b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/PersonResource.java
index a9a834b15f..6103ec96bc 100644
--- a/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/PersonResource.java
+++ b/integration/jaxrs-jsonb/src/test/java/com/blazebit/persistence/integration/jaxrs/jsonb/testsuite/resource/PersonResource.java
@@ -13,14 +13,14 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.net.URI;
 
 /**
diff --git a/integration/jaxrs-jsonb/src/test/resources/META-INF/beans.xml b/integration/jaxrs-jsonb/src/test/resources/META-INF/beans.xml
index dc74ca17f4..dc988397a1 100644
--- a/integration/jaxrs-jsonb/src/test/resources/META-INF/beans.xml
+++ b/integration/jaxrs-jsonb/src/test/resources/META-INF/beans.xml
@@ -3,6 +3,9 @@
   SPDX-License-Identifier: Apache-2.0
   Copyright Blazebit
   -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="all">
 </beans>
\ No newline at end of file
diff --git a/integration/jaxrs-jsonb/src/test/resources/META-INF/persistence.xml b/integration/jaxrs-jsonb/src/test/resources/META-INF/persistence.xml
index 9ab008bca4..7439de2720 100644
--- a/integration/jaxrs-jsonb/src/test/resources/META-INF/persistence.xml
+++ b/integration/jaxrs-jsonb/src/test/resources/META-INF/persistence.xml
@@ -10,11 +10,11 @@
         <class>com.blazebit.persistence.integration.jaxrs.jsonb.testsuite.entity.Person</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="user"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.sharedCache.mode" value="NONE"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
+            <property name="jakarta.persistence.jdbc.user" value="user"/>
+            <property name="jakarta.persistence.jdbc.password" value="password"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.sharedCache.mode" value="NONE"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integration/jaxrs/pom.xml b/integration/jaxrs/pom.xml
index 83ece937b6..50482af83b 100644
--- a/integration/jaxrs/pom.xml
+++ b/integration/jaxrs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -16,31 +16,4 @@
         <module.name>com.blazebit.persistence.integration.jaxrs</module.name>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        exports com.blazebit.persistence.integration.jaxrs;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/integration/jaxrs/src/main/java/module-info.java b/integration/jaxrs/src/main/java/module-info.java
new file mode 100644
index 0000000000..2a22818ceb
--- /dev/null
+++ b/integration/jaxrs/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jaxrs {
+	exports com.blazebit.persistence.integration.jaxrs;
+}
\ No newline at end of file
diff --git a/integration/jpa-base-jakarta/pom.xml b/integration/jpa-base-jakarta/pom.xml
deleted file mode 100644
index 807513056f..0000000000
--- a/integration/jpa-base-jakarta/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jpa</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-jpa-base:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jpa-base:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jpa-base:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- IntelliJ needs the source to be available to not complain about implementations, so we provide that... -->
-                    <execution>
-                        <id>unpack-sources</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}-sources.jar" dest="${project.build.directory}/java/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <!-- Unpack JAR because Quarkus relies on the directory contents for class loading -->
-                    <execution>
-                        <id>unpack-classes</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/classes/" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>intellij-fake-attach-source</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/java/</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jpa-base-jar/pom.xml b/integration/jpa-base-jar/pom.xml
deleted file mode 100644
index 26911f1a71..0000000000
--- a/integration/jpa-base-jar/pom.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jpa-base-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jpa</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-integration-jpa-base</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jpa-base/pom.xml b/integration/jpa-base/pom.xml
index 1f094c3285..18f0e2c08b 100644
--- a/integration/jpa-base/pom.xml
+++ b/integration/jpa-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -46,10 +46,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -57,71 +56,19 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires com.blazebit.persistence.core;
-                                        requires com.blazebit.persistence.core.parser;
-                                        exports com.blazebit.persistence.integration.jpa;
-                                        exports com.blazebit.persistence.integration.jpa.function;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <dependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>blaze-apt-utils</artifactId>
+                            <version>${version.blazeutils}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
+                    </annotationProcessors>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/integration/jpa-base/src/main/java/com/blazebit/persistence/integration/jpa/JpaMetamodelAccessorImpl.java b/integration/jpa-base/src/main/java/com/blazebit/persistence/integration/jpa/JpaMetamodelAccessorImpl.java
index 3d9664eb5e..6e7aacbb68 100644
--- a/integration/jpa-base/src/main/java/com/blazebit/persistence/integration/jpa/JpaMetamodelAccessorImpl.java
+++ b/integration/jpa-base/src/main/java/com/blazebit/persistence/integration/jpa/JpaMetamodelAccessorImpl.java
@@ -10,13 +10,13 @@
 import com.blazebit.persistence.spi.AttributePath;
 import com.blazebit.persistence.spi.JpaMetamodelAccessor;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/integration/jpa-base/src/main/java/module-info.java b/integration/jpa-base/src/main/java/module-info.java
new file mode 100644
index 0000000000..100c6673ff
--- /dev/null
+++ b/integration/jpa-base/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jpa {
+	requires java.sql;
+	requires jakarta.persistence;
+	requires com.blazebit.persistence.core;
+	requires com.blazebit.persistence.core.parser;
+	exports com.blazebit.persistence.integration.jpa;
+	exports com.blazebit.persistence.integration.jpa.function;
+}
\ No newline at end of file
diff --git a/integration/jsonb-jakarta/pom.xml b/integration/jsonb-jakarta/pom.xml
deleted file mode 100644
index 62768754fb..0000000000
--- a/integration/jsonb-jakarta/pom.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.jsonb</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jsonb</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-jsonb:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jsonb:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-jsonb:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/jsonb/pom.xml b/integration/jsonb/pom.xml
index fb2c66cbf0..1cbaf9c0cf 100644
--- a/integration/jsonb/pom.xml
+++ b/integration/jsonb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,12 +13,35 @@
     <name>Blazebit Persistence Integration JSONB</name>
 
     <properties>
-        <main.java.version>1.8</main.java.version>
-        <test.java.version>1.8</test.java.version>
         <module.name>com.blazebit.persistence.integration.jsonb</module.name>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
@@ -31,39 +54,32 @@
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
-            <version>1.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>1.0.9</version>
-            <scope>provided</scope>
+            <version>3.0.4</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-common-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.4}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate-apt}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -76,28 +92,11 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.view;
-                                        requires com.blazebit.common.utils;
-                                        exports com.blazebit.persistence.integration.jackson;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewIdValueAccessor.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewIdValueAccessor.java
index b3f79fff14..cd2289d12d 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewIdValueAccessor.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewIdValueAccessor.java
@@ -6,8 +6,8 @@
 package com.blazebit.persistence.integration.jsonb;
 
 
-import javax.json.bind.serializer.DeserializationContext;
-import javax.json.stream.JsonParser;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.stream.JsonParser;
 
 /**
  * This interface is used to supply an entity view id from platform specific sources
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializer.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializer.java
index a4fb6b3c6b..69903d8de4 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializer.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializer.java
@@ -14,10 +14,10 @@
 import javassist.CtNewConstructor;
 import javassist.bytecode.SignatureAttribute;
 
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.serializer.DeserializationContext;
-import javax.json.bind.serializer.JsonbDeserializer;
-import javax.json.stream.JsonParser;
+import jakarta.json.bind.JsonbConfig;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.stream.JsonParser;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
 import java.util.HashMap;
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewPropertyVisibilityStrategy.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewPropertyVisibilityStrategy.java
index 19735fa1e1..de00d28843 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewPropertyVisibilityStrategy.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewPropertyVisibilityStrategy.java
@@ -8,8 +8,8 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.type.EntityViewProxy;
 
-import javax.json.bind.annotation.JsonbTransient;
-import javax.json.bind.config.PropertyVisibilityStrategy;
+import jakarta.json.bind.annotation.JsonbTransient;
+import jakarta.json.bind.config.PropertyVisibilityStrategy;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewReferenceDeserializer.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewReferenceDeserializer.java
index cdc845f123..21b8550a20 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewReferenceDeserializer.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/EntityViewReferenceDeserializer.java
@@ -12,17 +12,16 @@
 import com.blazebit.persistence.view.metamodel.ManagedViewType;
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
 import com.blazebit.persistence.view.metamodel.ViewType;
-import org.eclipse.yasson.internal.JsonbRiParser;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.bind.annotation.JsonbProperty;
-import javax.json.bind.annotation.JsonbTransient;
-import javax.json.bind.serializer.DeserializationContext;
-import javax.json.bind.spi.JsonbProvider;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.annotation.JsonbTransient;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.spi.JsonbProvider;
+import jakarta.json.stream.JsonParser;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.HashMap;
@@ -198,12 +197,18 @@ private static JsonParser parser(JsonValue jsonValue) {
         JsonParser newParser;
         if (jsonValue instanceof JsonStructure) {
             newParser = new JsonStructureToParserAdapter((JsonStructure) jsonValue);
+            if (IS_YASSON && jsonValue instanceof JsonObject) {
+                // Yasson keeps the last processed event around for a deserialization context,
+                // which makes it hard to use the same deserialization context for re-processing sub-parts,
+                // but we have to get it to work somehow, because that is the only way to reuse the Jsonb instance
+                newParser.next();
+            }
         } else {
             newParser = new JsonValueToParserAdapter(jsonValue);
         }
-        if (IS_YASSON) {
-            return new JsonbRiParser(newParser);
-        }
+//        if (IS_YASSON) {
+//            return new org.eclipse.yasson.internal.JsonbRiParser(newParser);
+//        }
         return newParser;
     }
 }
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonArrayIterator.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonArrayIterator.java
index 8227e76ac8..da08ad7bd6 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonArrayIterator.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonArrayIterator.java
@@ -12,11 +12,11 @@
 
 package com.blazebit.persistence.integration.jsonb.jsonstructure;
 
-import javax.json.JsonArray;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.bind.JsonbException;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.JsonbException;
+import jakarta.json.stream.JsonParser;
 import java.util.Iterator;
 
 /**
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonObjectIterator.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonObjectIterator.java
index 0a5351703c..3623296508 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonObjectIterator.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonObjectIterator.java
@@ -12,10 +12,10 @@
 
 package com.blazebit.persistence.integration.jsonb.jsonstructure;
 
-import javax.json.JsonObject;
-import javax.json.JsonValue;
-import javax.json.bind.JsonbException;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.JsonbException;
+import jakarta.json.stream.JsonParser;
 import java.util.Iterator;
 
 /**
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureIterator.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureIterator.java
index 58a66e162a..eab8cf5d0e 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureIterator.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureIterator.java
@@ -12,14 +12,14 @@
 
 package com.blazebit.persistence.integration.jsonb.jsonstructure;
 
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.bind.JsonbException;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.JsonbException;
+import jakarta.json.stream.JsonParser;
 import java.util.Iterator;
 
 /**
- * Iterates over {@link javax.json.JsonStructure}.
+ * Iterates over {@link jakarta.json.JsonStructure}.
  */
 abstract class JsonStructureIterator implements Iterator<JsonParser.Event> {
 
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureToParserAdapter.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureToParserAdapter.java
index c8514fad28..5514177639 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureToParserAdapter.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonStructureToParserAdapter.java
@@ -12,14 +12,14 @@
 
 package com.blazebit.persistence.integration.jsonb.jsonstructure;
 
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.bind.JsonbException;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.JsonbException;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.math.BigDecimal;
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonValueToParserAdapter.java b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonValueToParserAdapter.java
index 7955e1198e..6e1b1751da 100644
--- a/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonValueToParserAdapter.java
+++ b/integration/jsonb/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/JsonValueToParserAdapter.java
@@ -12,12 +12,12 @@
 
 package com.blazebit.persistence.integration.jsonb.jsonstructure;
 
-import javax.json.JsonNumber;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.bind.JsonbException;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.bind.JsonbException;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.math.BigDecimal;
 import java.util.NoSuchElementException;
 
@@ -68,9 +68,9 @@ public Event next() {
 
     @Override
     public String getString() {
-        if (hasNext) {
-            throw new NoSuchElementException();
-        }
+//        if (hasNext) {
+//            throw new NoSuchElementException();
+//        }
 
         switch (value.getValueType()) {
             case TRUE:
@@ -109,9 +109,9 @@ public BigDecimal getBigDecimal() {
     }
 
     private JsonNumber getJsonNumberValue() {
-        if (hasNext) {
-            throw new NoSuchElementException();
-        }
+//        if (hasNext) {
+//            throw new NoSuchElementException();
+//        }
         if (value.getValueType() != JsonValue.ValueType.NUMBER) {
             throw new UnsupportedOperationException("Unsupported value: " + value);
         }
diff --git a/integration/jsonb/src/main/java/module-info.java b/integration/jsonb/src/main/java/module-info.java
new file mode 100644
index 0000000000..5d862c20cf
--- /dev/null
+++ b/integration/jsonb/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.jsonb {
+	requires jakarta.json.bind;
+	requires jakarta.json;
+	requires com.blazebit.persistence.view.impl;
+	requires com.blazebit.persistence.view;
+	requires org.javassist;
+	requires static org.eclipse.yasson;
+	exports com.blazebit.persistence.integration.jsonb;
+}
\ No newline at end of file
diff --git a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializerTest.java b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializerTest.java
index 22288ad320..50f273484b 100644
--- a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializerTest.java
+++ b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/EntityViewJsonbDeserializerTest.java
@@ -20,15 +20,15 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.json.JsonObject;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.annotation.JsonbTransient;
-import javax.json.bind.serializer.DeserializationContext;
-import javax.json.stream.JsonParser;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.json.JsonObject;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
+import jakarta.json.bind.annotation.JsonbTransient;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.stream.JsonParser;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -113,7 +113,7 @@ public Type getOwnerType() {
     }
 
     @EntityView(SomeEntity.class)
-    interface NameView {
+    public interface NameView {
         @IdMapping
         long getId();
         String getName();
@@ -129,7 +129,7 @@ public void testReadViewWithSetters() throws Exception {
     }
 
     @EntityView(SomeEntity.class)
-    interface ReadViewWithSetters {
+    public interface ReadViewWithSetters {
         @IdMapping
         long getId();
         String getName();
@@ -149,7 +149,7 @@ public void testUpdatableView() throws Exception {
 
     @EntityView(SomeEntity.class)
     @UpdatableEntityView
-    interface UpdateViewWithSetters {
+    public interface UpdateViewWithSetters {
         @IdMapping
         long getId();
         String getName();
@@ -169,7 +169,7 @@ public void testCreatableView() throws Exception {
 
     @EntityView(SomeEntity.class)
     @CreatableEntityView
-    interface CreatableViewWithSetters {
+    public interface CreatableViewWithSetters {
         @IdMapping
         long getId();
         String getName();
@@ -200,7 +200,7 @@ public void testCreatableAndUpdatableViewWithoutId() throws Exception {
     @EntityView(SomeEntity.class)
     @CreatableEntityView
     @UpdatableEntityView
-    interface CreatableAndUpdatableViewWithSetters {
+    public interface CreatableAndUpdatableViewWithSetters {
         @IdMapping
         long getId();
         String getName();
@@ -232,7 +232,7 @@ public void testCreatableAndUpdatableViewWithoutNestedUpdatableViewWithoutId() t
     @EntityView(SomeEntity.class)
     @CreatableEntityView
     @UpdatableEntityView
-    interface CreatableAndUpdatableViewWithNested {
+    public interface CreatableAndUpdatableViewWithNested {
         @IdMapping
         long getId();
         String getName();
@@ -255,7 +255,7 @@ public void testCreatableWithCollection() throws Exception {
     @EntityView(SomeEntity.class)
     @CreatableEntityView
     @UpdatableEntityView
-    interface CreatableWithCollection {
+    public interface CreatableWithCollection {
         @IdMapping
         long getId();
         String getName();
@@ -277,7 +277,7 @@ public void testCreatableWithCollectionWithSetter() throws Exception {
     @EntityView(SomeEntity.class)
     @CreatableEntityView
     @UpdatableEntityView
-    interface CreatableWithCollectionWithSetter {
+    public interface CreatableWithCollectionWithSetter {
         @IdMapping
         long getId();
         String getName();
@@ -299,7 +299,7 @@ public void testCreatableWithIgnoreId() throws Exception {
 
     @EntityView(SomeEntity.class)
     @CreatableEntityView
-    interface CreatableWithIgnoreId {
+    public interface CreatableWithIgnoreId {
         @IdMapping
         @JsonbTransient
         long getId();
@@ -320,7 +320,7 @@ public void testUpdatableWithCollectionWithSetter() throws Exception {
 
     @EntityView(SomeEntity.class)
     @UpdatableEntityView
-    interface UpdatableWithCollectionWithSetter {
+    public interface UpdatableWithCollectionWithSetter {
         @IdMapping
         long getId();
         String getName();
@@ -349,7 +349,7 @@ public <T> T getValue(JsonParser jsonParser, DeserializationContext deserializat
 
     @EntityView(SomeEntity.class)
     @UpdatableEntityView
-    interface UpdatableWithCollectionForIdAccessor {
+    public interface UpdatableWithCollectionForIdAccessor {
         @IdMapping
         long getId();
         String getName();
@@ -360,7 +360,7 @@ interface UpdatableWithCollectionForIdAccessor {
 
     @EntityView(SomeEntity.class)
     @CreatableEntityView
-    interface NameViewForIdAccessor {
+    public interface NameViewForIdAccessor {
         @IdMapping
         Long getId();
         String getName();
@@ -381,7 +381,7 @@ public void testJsonIgnore() throws Exception {
 
     @EntityView(SomeEntity.class)
     @CreatableEntityView
-    static abstract class ViewWithJsonIgnore {
+    public static abstract class ViewWithJsonIgnore {
         @IdMapping
         public abstract long getId();
         public abstract void setId(long id);
@@ -403,7 +403,7 @@ public void testSingularCollection() throws Exception {
 
     @EntityView(SomeEntity.class)
     @CreatableEntityView
-    static interface ViewWithSingularCollection {
+    public static interface ViewWithSingularCollection {
         @IdMapping
         long getId();
         String getName();
diff --git a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/SomeEntity.java b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/SomeEntity.java
index c1498b067c..c81971d793 100644
--- a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/SomeEntity.java
+++ b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/SomeEntity.java
@@ -5,13 +5,13 @@
 
 package com.blazebit.persistence.integration.jsonb;
 
-import javax.persistence.Basic;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import java.util.List;
 import java.util.Set;
 
diff --git a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/StringListConverter.java b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/StringListConverter.java
index 11364451a2..84e33caf5b 100644
--- a/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/StringListConverter.java
+++ b/integration/jsonb/src/test/java/com/blazebit/persistence/integration/jsonb/StringListConverter.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.integration.jsonb;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/integration/openjpa-jar/pom.xml b/integration/openjpa-jar/pom.xml
deleted file mode 100644
index 7a4f8dbbed..0000000000
--- a/integration/openjpa-jar/pom.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-openjpa-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.openjpa</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-openjpa</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-integration-openjpa</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-integration-openjpa</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/openjpa/pom.xml b/integration/openjpa/pom.xml
deleted file mode 100644
index a8fcb455fa..0000000000
--- a/integration/openjpa/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-openjpa</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Integration OpenJPA</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.openjpa</module.name>
-    </properties>
-    
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
-            <version>${version.openjpa}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires java.sql;
-                                        requires java.persistence;
-                                        requires org.openjpa;
-                                        requires com.blazebit.persistence.core;
-                                        provides com.blazebit.persistence.spi.EntityManagerFactoryIntegrator with com.blazebit.persistence.integration.openjpa.OpenJPAEntityManagerFactoryIntegrator;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/ObjectBuilderAggregateListenerAdapter.java b/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/ObjectBuilderAggregateListenerAdapter.java
deleted file mode 100644
index ad011e2ee0..0000000000
--- a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/ObjectBuilderAggregateListenerAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.openjpa;
-
-import com.blazebit.persistence.ObjectBuilder;
-import org.apache.openjpa.kernel.StoreContext;
-import org.apache.openjpa.kernel.exps.AggregateListener;
-
-import java.util.Collection;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class ObjectBuilderAggregateListenerAdapter implements AggregateListener {
-
-    private static final long serialVersionUID = 1L;
-    
-    @SuppressWarnings("unused")
-    private final ObjectBuilder<?> builder;
-
-    public ObjectBuilderAggregateListenerAdapter(ObjectBuilder<?> builder) {
-        this.builder = builder;
-    }
-
-    @Override
-    public String getTag() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean expectsArguments() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Object evaluate(Collection clctn, Class[] types, Collection clctn1, StoreContext sc) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public Class getType(Class[] types) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-}
diff --git a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAEntityManagerFactoryIntegrator.java b/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAEntityManagerFactoryIntegrator.java
deleted file mode 100644
index 87cd7cea5d..0000000000
--- a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAEntityManagerFactoryIntegrator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.openjpa;
-
-import com.blazebit.apt.service.ServiceProvider;
-import com.blazebit.persistence.spi.EntityManagerFactoryIntegrator;
-import com.blazebit.persistence.spi.JpaProvider;
-import com.blazebit.persistence.spi.JpaProviderFactory;
-import com.blazebit.persistence.spi.JpqlFunction;
-import com.blazebit.persistence.spi.JpqlFunctionGroup;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-@ServiceProvider(EntityManagerFactoryIntegrator.class)
-public class OpenJPAEntityManagerFactoryIntegrator implements EntityManagerFactoryIntegrator {
-    
-    private static final Logger LOG = Logger.getLogger(EntityManagerFactoryIntegrator.class.getName());
-    
-    @Override
-    public String getDbms(EntityManagerFactory entityManagerFactory) {
-        return null;
-    }
-
-    @Override
-    public JpaProviderFactory getJpaProviderFactory(final EntityManagerFactory entityManagerFactory) {
-        return new JpaProviderFactory() {
-            @Override
-            public JpaProvider createJpaProvider(EntityManager em) {
-                PersistenceUnitUtil persistenceUnitUtil = entityManagerFactory == null ? null : entityManagerFactory.getPersistenceUnitUtil();
-                if (persistenceUnitUtil == null && em != null) {
-                    persistenceUnitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
-                }
-                return new OpenJPAJpaProvider(persistenceUnitUtil);
-            }
-        };
-    }
-
-    @Override
-    public Map<String, JpqlFunction> getRegisteredFunctions(EntityManagerFactory entityManagerFactory) {
-        // TODO: implement
-        Map<String, JpqlFunction> functions = new HashMap<>();
-        return functions;
-    }
-
-    @Override
-    public EntityManagerFactory registerFunctions(EntityManagerFactory entityManagerFactory, Map<String, JpqlFunctionGroup> dbmsFunctions) {
-        // TODO: implement
-        return entityManagerFactory;
-    }
-}
diff --git a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAJpaProvider.java b/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAJpaProvider.java
deleted file mode 100644
index 76ca2a303a..0000000000
--- a/integration/openjpa/src/main/java/com/blazebit/persistence/integration/openjpa/OpenJPAJpaProvider.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.openjpa;
-
-import com.blazebit.persistence.JoinType;
-import com.blazebit.persistence.integration.jpa.JpaMetamodelAccessorImpl;
-import com.blazebit.persistence.spi.JoinTable;
-import com.blazebit.persistence.spi.JpaMetamodelAccessor;
-import com.blazebit.persistence.spi.JpaProvider;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * @author Christian Beikov
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class OpenJPAJpaProvider implements JpaProvider {
-
-    private static final String[] EMPTY = {};
-    private final PersistenceUnitUtil persistenceUnitUtil;
-
-    public OpenJPAJpaProvider(PersistenceUnitUtil persistenceUnitUtil) {
-        this.persistenceUnitUtil = persistenceUnitUtil;
-    }
-
-    @Override
-    public boolean supportsJpa21() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsEntityJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCrossJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsInsertStatement() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBracketsForListParameter() {
-        return false;
-    }
-
-    @Override
-    public boolean needsJoinSubqueryRewrite() {
-        return false;
-    }
-
-    @Override
-    public String getBooleanExpression(boolean value) {
-        return value ? "CASE WHEN 1 = 1 THEN true ELSE false END" : "CASE WHEN 1 = 1 THEN false ELSE true END";
-    }
-
-    @Override
-    public String getBooleanConditionalExpression(boolean value) {
-        return value ? "1 = 1" : "1 = 0";
-    }
-
-    @Override
-    public String getNullExpression() {
-        return "NULLIF(1,1)";
-    }
-
-    @Override
-    public String escapeCharacter(char character) {
-        return Character.toString(character);
-    }
-
-    @Override
-    public boolean supportsNullPrecedenceExpression() {
-        return false;
-    }
-
-    @Override
-    public void renderNullPrecedence(StringBuilder sb, String expression, String resolvedExpression, String order, String nulls) {
-        if (nulls != null) {
-            sb.append("CASE WHEN ").append(resolvedExpression != null ? resolvedExpression : expression).append(" IS NULL THEN ");
-            if ("FIRST".equals(nulls)) {
-                sb.append("0 ELSE 1");
-            } else {
-                sb.append("1 ELSE 0");
-            }
-            sb.append(" END, ");
-            sb.append(expression);
-            if (order != null) {
-                sb.append(' ').append(order);
-            }
-        } else {
-            sb.append(expression);
-            if (order != null) {
-                sb.append(' ').append(order);
-            }
-        }
-    }
-
-    @Override
-    public String getOnClause() {
-        return "ON";
-    }
-
-    @Override
-    public String getCollectionValueFunction() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCollectionValueDereference() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueryLimitOffset() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSetOperations() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsListagg() {
-        return false;
-    }
-
-    @Override
-    public Class<?> getDefaultQueryResultType() {
-        return Object.class;
-    }
-
-    @Override
-    public String getCustomFunctionInvocation(String functionName, int argumentCount) {
-        return functionName + "(";
-    }
-
-    @Override
-    public boolean supportsRootTreat() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTreatCorrelation() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRootTreatTreatJoin() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypePropertyResolving() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubtypeRelationResolving() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCountStar() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCountTuple() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCustomFunctions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsNonScalarSubquery() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueryInFunction() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueryAliasShadowing() {
-        return true;
-    }
-
-    @Override
-    public String[] getDiscriminatorColumnCheck(EntityType<?> entityType) {
-        return null;
-    }
-
-    @Override
-    public boolean isForeignJoinColumn(EntityType<?> ownerType, String attributeName) {
-        // just return true since we don't need that for openjpa anyway
-        return true;
-    }
-
-    @Override
-    public boolean isColumnShared(EntityType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public ConstraintType requiresTreatFilter(EntityType<?> ownerType, String attributeName, JoinType joinType) {
-        return ConstraintType.NONE;
-    }
-
-    @Override
-    public String getMappedBy(EntityType<?> ownerType, String attributeName) {
-        // just return null since we don't need that for openjpa anyway
-        return null;
-    }
-
-    @Override
-    public Map<String, String> getWritableMappedByMappings(EntityType<?> inverseType, EntityType<?> ownerType, String attributeName, String inverseAttribute) {
-        return null;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnNames(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public String[] getColumnTypes(EntityType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return EMPTY;
-    }
-
-    @Override
-    public JoinTable getJoinTable(EntityType<?> ownerType, String attributeName) {
-        // just return null since we don't need that for openjpa anyway
-        return null;
-    }
-
-    @Override
-    public boolean isBag(EntityType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isOrphanRemoval(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean isDeleteCascaded(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean hasJoinCondition(ManagedType<?> ownerType, String elementCollectionPath, String attributeName) {
-        return false;
-    }
-
-    @Override
-    public boolean containsEntity(EntityManager em, Class<?> entityClass, Object id) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationIdExpressions() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsForeignAssociationInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetEmbeddable() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUpdateSetAssociationId() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTransientEntityAsParameter() {
-        return true;
-    }
-
-    @Override
-    public boolean needsAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsBrokenAssociationToIdRewriteInOnClause() {
-        return false;
-    }
-
-    @Override
-    public boolean needsTypeConstraintForColumnSharing() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCollectionTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsJoinTableCleanupOnDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCorrelationPredicateWhenCorrelatingWithWhereClause() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSingleValuedAssociationNaturalIdExpressions() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsGroupByEntityAlias() {
-        return true;
-    }
-
-    @Override
-    public boolean needsElementCollectionIdCutoff() {
-        return false;
-    }
-
-    @Override
-    public boolean needsUnproxyForFieldAccess() {
-        return false;
-    }
-
-    @Override
-    public boolean needsCaseWhenElseBranch() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsLikePatternEscape() {
-        return true;
-    }
-
-    @Override
-    public void setCacheable(Query query) {
-        if (query instanceof OpenJPAQuery) {
-            ((OpenJPAQuery) query).getFetchPlan().setQueryResultCacheEnabled(true);
-        }
-    }
-
-    @Override
-    public void setSingularParameter(Query query, String name, Object value) {
-        query.setParameter(name, value);
-    }
-
-    private Attribute<?, ?> getAttribute(ManagedType<?> ownerType, String attributeName) {
-        if (attributeName.indexOf('.') == -1) {
-            return ownerType.getAttribute(attributeName);
-        }
-        ManagedType<?> t = ownerType;
-        SingularAttribute<?, ?> attr = null;
-        String[] parts = attributeName.split("\\.");
-        for (int i = 0; i < parts.length; i++) {
-            attr = t.getSingularAttribute(parts[i]);
-            if (attr.getType().getPersistenceType() != Type.PersistenceType.BASIC) {
-                t = (ManagedType<?>) attr.getType();
-            } else if (i + 1 != parts.length) {
-                throw new IllegalArgumentException("Illegal attribute name for type [" + ownerType.getJavaType().getName() + "]: " + attributeName);
-            }
-        }
-
-        return attr;
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> ownerType, String attributeName) {
-        Attribute<?, ?> attribute = getAttribute(ownerType, attributeName);
-        if (((SingularAttribute<?, ?>) attribute).getType() instanceof EntityType<?>) {
-            EntityType<?> entityType = (EntityType<?>) ((SingularAttribute<?, ?>) attribute).getType();
-            if (entityType.hasSingleIdAttribute()) {
-                return Collections.singletonList(entityType.getId(entityType.getIdType().getJavaType()).getName());
-            } else {
-                Set<SingularAttribute<?, ?>> attributes = (Set<SingularAttribute<?, ?>>) (Set) entityType.getIdClassAttributes();
-                List<String> attributeNames = new ArrayList<>(attributes.size());
-
-                for (Attribute<?, ?> attr : attributes) {
-                    attributeNames.add(attr.getName());
-                }
-
-                return attributeNames;
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<String> getIdentifierOrUniqueKeyEmbeddedPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public Map<String, String> getJoinMappingPropertyNames(EntityType<?> owner, String elementCollectionPath, String attributeName) {
-        List<String> keys;
-        if (elementCollectionPath == null) {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, attributeName);
-        } else {
-            keys = getIdentifierOrUniqueKeyEmbeddedPropertyNames(owner, elementCollectionPath, attributeName);
-        }
-        Map<String, String> map = new HashMap<>(keys.size());
-        for (String key : keys) {
-            map.put(key, null);
-        }
-        return map;
-    }
-
-    @Override
-    public boolean supportsEnumLiteral(ManagedType<?> ownerType, String attributeName, boolean key) {
-        return true;
-    }
-
-    @Override
-    public boolean supportsTemporalLiteral() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsNonDrivingAliasInOnClause() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSelectCompositeIdEntityInSubquery() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyParameterForNonPkAssociation() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsProxyRemove() {
-        return false;
-    }
-
-    @Override
-    public void initialize(Object entity) {
-        // Just call a method on the entity to trigger possible lazy initialization
-        entity.hashCode();
-    }
-
-    @Override
-    public Object getIdentifier(Object entity) {
-        return persistenceUnitUtil.getIdentifier(entity);
-    }
-
-    @Override
-    public <T> T unproxy(T entity) {
-        // OpenJPA does not support proxying without enhancement?
-        return entity;
-    }
-
-    @Override
-    public JpaMetamodelAccessor getJpaMetamodelAccessor() {
-        return JpaMetamodelAccessorImpl.INSTANCE;
-    }
-
-}
diff --git a/integration/pom.xml b/integration/pom.xml
index c2951a72fe..56bb03d68e 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -21,24 +21,11 @@
 
     <modules>
         <module>jpa-base</module>
-        <module>hibernate-base</module>
-<!--        <module>hibernate6-base</module>-->
-        <module>hibernate-4.2</module>
-        <module>hibernate-4.3</module>
-        <module>hibernate-5</module>
-        <module>hibernate-5.2</module>
-        <module>hibernate-5.3</module>
-        <module>hibernate-5.4</module>
-        <module>hibernate-5.5</module>
-        <module>hibernate-5.6</module>
-<!--        <module>hibernate-6.2</module>-->
-        <module>datanucleus</module>
-        <module>datanucleus-5.1</module>
+        <module>hibernate6-base</module>
+        <module>hibernate-6.2</module>
         <module>eclipselink</module>
-        <module>openjpa</module>
         <module>entity-view-cdi</module>
-        <module>entity-view-spring</module>
-<!--        <module>entity-view-spring-6.0</module>-->
+        <module>entity-view-spring-6.0</module>
         <module>spring-data</module>
         <module>spring-hateoas</module>
         <module>deltaspike-data</module>
@@ -49,148 +36,9 @@
         <module>jsonb</module>
         <module>graphql</module>
         <module>graphql-spqr</module>
-        <module>graphql-dgs</module>
         <module>querydsl</module>
-        <module>quarkus</module>
-<!--        <module>quarkus-3</module>-->
-
-        <module>jpa-base-jar</module>
-        <module>openjpa-jar</module>
-        <module>entity-view-cdi-jar</module>
-
-        <module>jpa-base-jakarta</module>
-        <module>hibernate-base-jakarta</module>
-        <module>hibernate-5.5-jakarta</module>
-        <module>hibernate-5.6-jakarta</module>
-        <module>entity-view-cdi-jakarta</module>
-        <module>jaxrs-jackson-jakarta</module>
-        <module>jaxrs-jsonb-jakarta</module>
-        <module>jackson-jakarta</module>
-        <module>jsonb-jakarta</module>
-        <module>graphql-jakarta</module>
-        <module>graphql-spqr-jakarta</module>
-<!--        <module>graphql-dgs-6.0</module>-->
+        <module>quarkus-3</module>
+        <module>graphql-dgs-7.0</module>
     </modules>
 
-    <!-- Hibernate 6 is compiled with JDK 11, so we can only compile it, if we the build is running on a JDK 11 -->
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <modules>
-                <module>jpa-base</module>
-                <module>hibernate-base</module>
-                <module>hibernate6-base</module>
-                <module>hibernate-4.2</module>
-                <module>hibernate-4.3</module>
-                <module>hibernate-5</module>
-                <module>hibernate-5.2</module>
-                <module>hibernate-5.3</module>
-                <module>hibernate-5.4</module>
-                <module>hibernate-5.5</module>
-                <module>hibernate-5.6</module>
-                <module>hibernate-6.2</module>
-                <module>datanucleus</module>
-                <module>datanucleus-5.1</module>
-                <module>eclipselink</module>
-                <module>openjpa</module>
-                <module>entity-view-cdi</module>
-                <module>entity-view-spring</module>
-<!--                <module>entity-view-spring-6.0</module>-->
-                <module>spring-data</module>
-                <module>spring-hateoas</module>
-                <module>deltaspike-data</module>
-                <module>jaxrs</module>
-                <module>jaxrs-jackson</module>
-                <module>jaxrs-jsonb</module>
-                <module>jackson</module>
-                <module>jsonb</module>
-                <module>graphql</module>
-                <module>graphql-spqr</module>
-                <module>graphql-dgs</module>
-                <module>querydsl</module>
-                <module>quarkus</module>
-                <module>quarkus-3</module>
-
-                <module>jpa-base-jar</module>
-                <module>openjpa-jar</module>
-                <module>entity-view-cdi-jar</module>
-
-                <module>jpa-base-jakarta</module>
-                <module>hibernate-base-jakarta</module>
-                <module>hibernate-5.5-jakarta</module>
-                <module>hibernate-5.6-jakarta</module>
-                <module>entity-view-cdi-jakarta</module>
-                <module>jaxrs-jackson-jakarta</module>
-                <module>jaxrs-jsonb-jakarta</module>
-                <module>jackson-jakarta</module>
-                <module>jsonb-jakarta</module>
-                <module>graphql-jakarta</module>
-                <module>graphql-spqr-jakarta</module>
-<!--                <module>graphql-dgs-6.0</module>-->
-            </modules>
-        </profile>
-
-        <!-- Spring 6 is compiled with JDK 17, so we can only compile it, if we the build is running on a JDK 17 -->
-        <profile>
-            <id>jdk17+</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <modules>
-                <module>jpa-base</module>
-                <module>hibernate-base</module>
-                <module>hibernate6-base</module>
-                <module>hibernate-4.2</module>
-                <module>hibernate-4.3</module>
-                <module>hibernate-5</module>
-                <module>hibernate-5.2</module>
-                <module>hibernate-5.3</module>
-                <module>hibernate-5.4</module>
-                <module>hibernate-5.5</module>
-                <module>hibernate-5.6</module>
-                <module>hibernate-6.2</module>
-                <module>datanucleus</module>
-                <module>datanucleus-5.1</module>
-                <module>eclipselink</module>
-                <module>openjpa</module>
-                <module>entity-view-cdi</module>
-                <module>entity-view-spring</module>
-                <module>entity-view-spring-6.0</module>
-                <module>spring-data</module>
-                <module>spring-hateoas</module>
-                <module>deltaspike-data</module>
-                <module>jaxrs</module>
-                <module>jaxrs-jackson</module>
-                <module>jaxrs-jsonb</module>
-                <module>jackson</module>
-                <module>jsonb</module>
-                <module>graphql</module>
-                <module>graphql-spqr</module>
-                <module>graphql-dgs</module>
-                <module>querydsl</module>
-                <module>quarkus</module>
-                <module>quarkus-3</module>
-
-                <module>jpa-base-jar</module>
-                <module>openjpa-jar</module>
-                <module>entity-view-cdi-jar</module>
-
-                <module>jpa-base-jakarta</module>
-                <module>hibernate-base-jakarta</module>
-                <module>hibernate-5.5-jakarta</module>
-                <module>hibernate-5.6-jakarta</module>
-                <module>entity-view-cdi-jakarta</module>
-                <module>jaxrs-jackson-jakarta</module>
-                <module>jaxrs-jsonb-jakarta</module>
-                <module>jackson-jakarta</module>
-                <module>jsonb-jakarta</module>
-                <module>graphql-jakarta</module>
-                <module>graphql-spqr-jakarta</module>
-                <module>graphql-dgs-7.0</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration/quarkus-3/deployment/pom.xml b/integration/quarkus-3/deployment/pom.xml
index 2caa232411..e9ba0fde5a 100644
--- a/integration/quarkus-3/deployment/pom.xml
+++ b/integration/quarkus-3/deployment/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-quarkus-3-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -40,37 +40,36 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-parser</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
+            <artifactId>blaze-persistence-integration-jpa-base</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -85,7 +84,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
+            <artifactId>blaze-persistence-integration-jackson</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -95,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
+            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -104,6 +103,40 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!-- Overriding the JUnit version is kind of pain -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${version.junit-jupiter}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${version.junit-platform}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${version.junit-jupiter}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.rest-assured</groupId>
@@ -162,24 +195,30 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-extension-processor</artifactId>
-                        <version>${version.quarkus-3}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>process-build-steps</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>compile</phase>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <dependency>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${version.quarkus-3}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <compilerArg>-AstrictCascadingCheck=false</compilerArg>
+                        <compilerArg>-AdefaultVersionAttributeName=version</compilerArg>
+                        <compilerArg>-AdefaultVersionAttributeType=java.lang.Long</compilerArg>
+                    </compilerArgs>
+                    <annotationProcessors>
+                        <processor>io.quarkus.annotation.processor.ExtensionAnnotationProcessor</processor>
+                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                    </annotationProcessors>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -200,86 +239,13 @@
             <dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-<!--                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>-->
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -295,116 +261,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we still run against 6.2 because Quarkus doesn't support 6.3 yet -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-<!--                    <version>${version.hibernate-6.3}</version>-->
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-<!--                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>-->
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                            <systemProperties>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>hibernate-6.4</id>
             <!-- Note that we still run against 6.2 because Quarkus doesn't support 6.4 yet -->
@@ -420,196 +276,13 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-<!--                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>-->
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                            <systemProperties>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we still run against 6.2 because Quarkus doesn't support 6.5 yet -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-<!--                    <version>${version.hibernate-6.4}</version>-->
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-<!--                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>-->
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -640,86 +313,13 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-<!--                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>-->
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jakarta-jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jakarta-jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jakarta-jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.jakarta-activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/integration/quarkus-3/pom.xml b/integration/quarkus-3/pom.xml
index 7248fd91c3..fbdd909079 100644
--- a/integration/quarkus-3/pom.xml
+++ b/integration/quarkus-3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,6 @@
         <module>deployment</module>
     </modules>
 
-    <properties>
-        <main.java.version>11</main.java.version>
-
-        <version.jandex>3.0.5</version.jandex>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -30,12 +24,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>jakarta.persistence</groupId>
-                <artifactId>jakarta.persistence-api</artifactId>
-                <version>${version.jakarta-jpa-3.1-api}</version>
-                <scope>provided</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/integration/quarkus-3/runtime/pom.xml b/integration/quarkus-3/runtime/pom.xml
index 50233d05eb..ee997a56a3 100644
--- a/integration/quarkus-3/runtime/pom.xml
+++ b/integration/quarkus-3/runtime/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>blaze-persistence-integration-quarkus-3-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,27 +35,26 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -80,49 +80,43 @@
         </resources>
         <plugins>
             <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-extension-maven-plugin</artifactId>
-            <version>${version.quarkus-3}</version>
-            <executions>
-                <execution>
-                    <phase>compile</phase>
-                    <goals>
-                        <goal>extension-descriptor</goal>
-                    </goals>
-                    <configuration>
-                        <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
-                        <capabilities>
-                            <provides>com.blazebit.persistence.integration.quarkus</provides>
-                        </capabilities>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-extension-processor</artifactId>
-                        <version>${version.quarkus-3}</version>
-                    </dependency>
-                </dependencies>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
+                <version>${version.quarkus-3}</version>
                 <executions>
                     <execution>
-                        <id>process-config-roots</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>process</goal>
+                            <goal>extension-descriptor</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
-                            <optionMap>
-                                <legacyConfigRoot>true</legacyConfigRoot>
-                            </optionMap>
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            </deployment>
+                            <capabilities>
+                                <provides>com.blazebit.persistence.integration.quarkus</provides>
+                            </capabilities>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <dependency>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${version.quarkus-3}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <compilerArg>-AlegacyConfigRoot=true</compilerArg>
+                    </compilerArgs>
+                    <annotationProcessors>
+                        <processor>io.quarkus.annotation.processor.ExtensionAnnotationProcessor</processor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/integration/quarkus/deployment/pom.xml b/integration/quarkus/deployment/pom.xml
deleted file mode 100644
index 6f22ee656f..0000000000
--- a/integration/quarkus/deployment/pom.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-quarkus-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-quarkus-deployment</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.quarkus.deployment</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-            <version>${version.quarkus}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
-            <version>${version.quarkus}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
-            <version>${version.quarkus}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-quarkus</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-extension-processor</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-            <version>${version.quarkus}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${asmVersion}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>${asmVersion}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-extension-processor</artifactId>
-                        <version>${version.quarkus}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>process-build-steps</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>compile</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                        <processor>
-                                            com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor
-                                        </processor>
-                                    </processors>
-                                    <optionMap>
-                                        <strictCascadingCheck>false</strictCascadingCheck>
-                                        <defaultVersionAttributeName>version</defaultVersionAttributeName>
-                                        <defaultVersionAttributeType>java.lang.Long</defaultVersionAttributeType>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                            <systemPropertyVariables>
-                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                <!-- Required for JDK 16 -->
-                                <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceCdiProcessor.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceCdiProcessor.java
deleted file mode 100644
index 28d7bb562a..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceCdiProcessor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstanceConfiguration;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstanceUtil;
-import com.blazebit.persistence.integration.quarkus.runtime.EntityViewRecorder;
-import com.blazebit.persistence.view.EntityViewManager;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
-import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
-import io.quarkus.arc.processor.AnnotationsTransformer;
-import io.quarkus.arc.processor.DotNames;
-import io.quarkus.arc.processor.Transformation;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
-import org.jboss.jandex.AnnotationTarget;
-import org.jboss.jandex.AnnotationValue;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Singleton;
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-class BlazePersistenceCdiProcessor {
-    private static final DotName BLAZE_PERSISTENCE_INSTANCE_QUALIFIER = DotName.createSimple(BlazePersistenceInstance.class.getName());
-
-    private static final DotName CRITERIA_BUILDER_FACTORY = DotName.createSimple(CriteriaBuilderFactory.class.getName());
-    private static final DotName ENTITY_VIEW_MANAGER = DotName.createSimple(EntityViewManager.class.getName());
-
-    @BuildStep
-    AnnotationsTransformerBuildItem convertJpaResourceAnnotationsToQualifier(
-            List<BlazePersistenceInstanceDescriptorBuildItem> blazePersistenceDescriptors) {
-        AnnotationsTransformer transformer = new AnnotationsTransformer() {
-
-            @Override
-            public boolean appliesTo(AnnotationTarget.Kind kind) {
-                // at some point we might want to support METHOD_PARAMETER too but for now getting annotations for them
-                // is cumbersome so let's wait for Jandex improvements
-                return kind == AnnotationTarget.Kind.FIELD;
-            }
-
-            @Override
-            public void transform(TransformationContext transformationContext) {
-                FieldInfo field = transformationContext.getTarget().asField();
-
-                if (!ENTITY_VIEW_MANAGER.equals(field.type().name()) && !CRITERIA_BUILDER_FACTORY.equals(field.type().name())) {
-                    return;
-                }
-
-                DotName blazePersistenceInstanceAnnotation;
-                if (field.hasAnnotation(BLAZE_PERSISTENCE_INSTANCE_QUALIFIER)) {
-                    blazePersistenceInstanceAnnotation = BLAZE_PERSISTENCE_INSTANCE_QUALIFIER;
-                } else {
-                    return;
-                }
-
-                AnnotationValue blazePersistenceInstanceAnnotationValue = field.annotation(blazePersistenceInstanceAnnotation).value();
-
-                Transformation transformation = transformationContext.transform()
-                        .add(DotNames.INJECT);
-                if (blazePersistenceInstanceAnnotationValue == null || blazePersistenceInstanceAnnotationValue.asString().isEmpty()) {
-                    transformation.add(DotNames.DEFAULT);
-                } else if (blazePersistenceDescriptors.size() == 1
-                        && blazePersistenceDescriptors.get(0).getBlazePersistenceInstanceName()
-                                .equals(blazePersistenceInstanceAnnotationValue.asString())) {
-                    // we are in the case where we have only one Blaze-Persistence instance defined
-                    // in this case, we consider it the default too if the name matches
-                    transformation.add(DotNames.DEFAULT);
-                }
-                transformation.done();
-            }
-        };
-
-        return new AnnotationsTransformerBuildItem(transformer);
-    }
-
-    @Record(ExecutionTime.RUNTIME_INIT)
-    @BuildStep
-    void generateBeans(EntityViewRecorder recorder,
-                                 List<BlazePersistenceInstanceDescriptorBuildItem> blazePersistenceDescriptors,
-                                 BuildProducer<AdditionalBeanBuildItem> additionalBeans,
-                                 BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
-        if (blazePersistenceDescriptors.isEmpty()) {
-            // No persistence units have been configured so bail out
-            return;
-        }
-
-        // add the @BlazePersistenceInstance class otherwise it won't be registered as a qualifier
-        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(BlazePersistenceInstance.class).build());
-
-        // we have only one Blaze-Persistence instance defined: we make it the default even if it has a name
-        if (blazePersistenceDescriptors.size() == 1) {
-            BlazePersistenceInstanceDescriptorBuildItem blazePersistenceDescriptor = blazePersistenceDescriptors.get(0);
-            String blazePersistenceInstanceName = blazePersistenceDescriptor.getBlazePersistenceInstanceName();
-            BlazePersistenceInstanceConfiguration blazePersistenceConfig = blazePersistenceDescriptor.getBlazePersistenceConfig();
-            String persistenceUnitName = blazePersistenceConfig.persistenceUnit.orElse(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
-
-            syntheticBeanBuildItemBuildProducer
-                    .produce(createSyntheticBean(blazePersistenceInstanceName,
-                            true,
-                            CriteriaBuilderFactory.class,
-                            recorder.criteriaBuilderFactorySupplier(blazePersistenceConfig, blazePersistenceInstanceName, persistenceUnitName),
-                            true));
-
-            syntheticBeanBuildItemBuildProducer
-                    .produce(createSyntheticBean(blazePersistenceInstanceName,
-                            true,
-                            EntityViewManager.class,
-                            recorder.entityViewManagerSupplier(
-                                    blazePersistenceConfig,
-                                    blazePersistenceInstanceName,
-                                    blazePersistenceDescriptor.getEntityViewClasses(),
-                                    blazePersistenceDescriptor.getEntityViewListenerClasses()
-                            ),
-                            false));
-
-            return;
-        }
-
-        for (BlazePersistenceInstanceDescriptorBuildItem blazePersistenceDescriptor : blazePersistenceDescriptors) {
-            String blazePersistenceInstanceName = blazePersistenceDescriptor.getBlazePersistenceInstanceName();
-            BlazePersistenceInstanceConfiguration blazePersistenceConfig = blazePersistenceDescriptor.getBlazePersistenceConfig();
-            String persistenceUnitName = blazePersistenceConfig.persistenceUnit.orElse(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
-            boolean defaultBlazePersistenceInstance = BlazePersistenceInstanceUtil.isDefaultBlazePersistenceInstance(blazePersistenceInstanceName);
-
-            syntheticBeanBuildItemBuildProducer
-                    .produce(createSyntheticBean(blazePersistenceInstanceName,
-                            defaultBlazePersistenceInstance,
-                            CriteriaBuilderFactory.class,
-                            recorder.criteriaBuilderFactorySupplier(blazePersistenceConfig, blazePersistenceInstanceName, persistenceUnitName),
-                            true));
-
-            syntheticBeanBuildItemBuildProducer
-                    .produce(createSyntheticBean(blazePersistenceInstanceName,
-                            defaultBlazePersistenceInstance,
-                            EntityViewManager.class,
-                            recorder.entityViewManagerSupplier(
-                                    blazePersistenceConfig,
-                                    blazePersistenceInstanceName,
-                                    blazePersistenceDescriptor.getEntityViewClasses(),
-                                    blazePersistenceDescriptor.getEntityViewListenerClasses()
-                            ),
-                            false));
-        }
-    }
-
-    private static <T> SyntheticBeanBuildItem createSyntheticBean(String blazePersistenceInstanceName, boolean isDefaultBlazePersistenceInstance,
-                                                                  Class<T> type, Supplier<T> supplier, boolean defaultBean) {
-        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
-                .configure(type)
-                .scope(Singleton.class)
-                .setRuntimeInit()
-                .unremovable()
-                .supplier(supplier);
-
-        if (defaultBean) {
-            configurator.defaultBean();
-        }
-
-        if (isDefaultBlazePersistenceInstance) {
-            configurator.addQualifier(Default.class);
-        } else {
-            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", blazePersistenceInstanceName).done();
-            configurator.addQualifier().annotation(BlazePersistenceInstance.class).addValue("value", blazePersistenceInstanceName).done();
-        }
-
-        return configurator.done();
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceInstanceDescriptorBuildItem.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceInstanceDescriptorBuildItem.java
deleted file mode 100644
index f968bdad08..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceInstanceDescriptorBuildItem.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstanceConfiguration;
-import io.quarkus.builder.item.MultiBuildItem;
-
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-public final class BlazePersistenceInstanceDescriptorBuildItem extends MultiBuildItem {
-    private final String blazePersistenceInstanceName;
-    private final BlazePersistenceInstanceConfiguration blazePersistenceConfig;
-    private final Set<String> entityViewClasses;
-    private final Set<String> entityViewListenerClasses;
-
-    public BlazePersistenceInstanceDescriptorBuildItem(String blazePersistenceInstanceName, BlazePersistenceInstanceConfiguration blazePersistenceConfig, Set<String> entityViewClasses, Set<String> entityViewListenerClasses) {
-        this.blazePersistenceInstanceName = blazePersistenceInstanceName;
-        this.blazePersistenceConfig = blazePersistenceConfig;
-        this.entityViewClasses = entityViewClasses;
-        this.entityViewListenerClasses = entityViewListenerClasses;
-    }
-
-    public String getBlazePersistenceInstanceName() {
-        return blazePersistenceInstanceName;
-    }
-
-    public BlazePersistenceInstanceConfiguration getBlazePersistenceConfig() {
-        return blazePersistenceConfig;
-    }
-
-    public Set<String> getEntityViewClasses() {
-        return entityViewClasses;
-    }
-
-    public Set<String> getEntityViewListenerClasses() {
-        return entityViewListenerClasses;
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java
deleted file mode 100644
index b31ccb79de..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.impl.function.entity.ValuesEntity;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceConfiguration;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceHibernateOrmIntegrationStaticInitListener;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstanceConfiguration;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstanceUtil;
-import com.blazebit.persistence.parser.expression.ConcurrentHashMapExpressionCache;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.spi.EntityViewMapping;
-import io.quarkus.builder.Version;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
-import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
-import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
-import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem;
-import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
-import io.quarkus.runtime.configuration.ConfigurationException;
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-import org.jboss.logging.Logger;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-class BlazePersistenceProcessor {
-
-    static final String CAPABILITY = "com.blazebit.persistence.integration.quarkus";
-    static final String FEATURE = "blaze-persistence";
-
-    private static final Logger LOG = Logger.getLogger(BlazePersistenceProcessor.class);
-    private static final DotName ENTITY_VIEW = DotName.createSimple(EntityView.class.getName());
-    private static final DotName BLAZE_PERSISTENCE_INSTANCE = DotName.createSimple(BlazePersistenceInstance.class.getName());
-    private static final DotName BLAZE_PERSISTENCE_INSTANCE_REPEATABLE_CONTAINER = DotName
-            .createSimple(BlazePersistenceInstance.List.class.getName());
-
-    @BuildStep
-    CapabilityBuildItem capability() {
-        String version = Version.getVersion();
-        int dotIndex = version.indexOf('.');
-        // As of version Quarkus 2, the capabilities are read from the extension descriptor
-        if (dotIndex == -1 || Integer.parseInt(version.substring(0, dotIndex)) >= 2) {
-            return null;
-        }
-        return new CapabilityBuildItem(CAPABILITY);
-    }
-
-    @BuildStep
-    FeatureBuildItem feature() {
-        return new FeatureBuildItem(FEATURE);
-    }
-
-    @BuildStep
-    AdditionalIndexedClassesBuildItem addBlazePersistenceInstanceAnnotationToIndex() {
-        return new AdditionalIndexedClassesBuildItem(BlazePersistenceInstance.class.getName());
-    }
-
-    @BuildStep
-    void addBlazePersistenceIntegrationDescriptor(List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors, BuildProducer<HibernateOrmIntegrationStaticConfiguredBuildItem> staticConfiguredBuildItemBuildProducer) {
-        for (PersistenceUnitDescriptorBuildItem persistenceUnitDescriptor : persistenceUnitDescriptors) {
-            staticConfiguredBuildItemBuildProducer.produce(new HibernateOrmIntegrationStaticConfiguredBuildItem(FEATURE, persistenceUnitDescriptor.getPersistenceUnitName()).setInitListener(new BlazePersistenceHibernateOrmIntegrationStaticInitListener()));
-        }
-    }
-
-    @BuildStep
-    void addBlazePersistenceEntities(BuildProducer<AdditionalJpaModelBuildItem> jpaModelBuildItemBuildProducer) {
-        Constructor<AdditionalJpaModelBuildItem> constructor = (Constructor<AdditionalJpaModelBuildItem>) AdditionalJpaModelBuildItem.class.getDeclaredConstructors()[0];
-        Object argument;
-        if (constructor.getParameterTypes()[0] == Class.class) {
-            argument = ValuesEntity.class;
-        } else {
-            argument = ValuesEntity.class.getName();
-        }
-        try {
-            jpaModelBuildItemBuildProducer.produce(constructor.newInstance(argument));
-        } catch (Exception e) {
-            throw new RuntimeException("Could not add ValuesEntity class to persistence unit!", e);
-        }
-    }
-
-    @BuildStep
-    void includeArchivesHostingEntityViewPackagesInIndex(BlazePersistenceConfiguration blazePersistenceConfig,
-                                                     BuildProducer<AdditionalApplicationArchiveMarkerBuildItem> additionalApplicationArchiveMarkers) {
-        if (blazePersistenceConfig.defaultBlazePersistence.packages.isPresent()) {
-            for (String pakkage : blazePersistenceConfig.defaultBlazePersistence.packages.get()) {
-                additionalApplicationArchiveMarkers
-                        .produce(new AdditionalApplicationArchiveMarkerBuildItem(pakkage.replace('.', '/')));
-            }
-        }
-        for (BlazePersistenceInstanceConfiguration blazePersistenceInstanceConfig : blazePersistenceConfig.blazePersistenceInstances.values()) {
-            if (blazePersistenceInstanceConfig.packages.isPresent()) {
-                for (String pakkage : blazePersistenceInstanceConfig.packages.get()) {
-                    additionalApplicationArchiveMarkers
-                            .produce(new AdditionalApplicationArchiveMarkerBuildItem(pakkage.replace('.', '/')));
-                }
-            }
-        }
-    }
-
-    @BuildStep
-    public EntityViewsBuildItem produceEntityViewsBuildItem(CombinedIndexBuildItem index) {
-        EntityViewJandexScavenger entityViewJandexScavenger = new EntityViewJandexScavenger(index.getIndex());
-        return entityViewJandexScavenger.discoverAndRegisterEntityViews();
-    }
-
-    @BuildStep
-    public EntityViewListenersBuildItem produceEntityViewListenersBuildItem(CombinedIndexBuildItem index) {
-        EntityViewJandexScavenger entityViewJandexScavenger = new EntityViewJandexScavenger(index.getIndex());
-        return entityViewJandexScavenger.discoverAndRegisterEntityViewListeners();
-    }
-
-    @BuildStep
-    void buildBlazePersistenceInstanceDescriptors(EntityViewsBuildItem entityViewsBuildItem,
-                                                  CombinedIndexBuildItem indexBuildItem,
-                                                  EntityViewListenersBuildItem entityViewListenersBuildItem,
-                                                  List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
-                                                  BlazePersistenceConfiguration blazePersistenceConfig,
-                                                  BuildProducer<BlazePersistenceInstanceDescriptorBuildItem> blazePersistenceDescriptorBuildItemProducer) {
-        if (persistenceUnitDescriptors.isEmpty()) {
-            LOG.warn("The Blaze-Persistence dependency is present but no persistence units have been defined.");
-            return;
-        }
-
-        Optional<PersistenceUnitDescriptorBuildItem> defaultPersistenceUnit = persistenceUnitDescriptors.stream()
-                .filter(pu -> PersistenceUnitUtil.isDefaultPersistenceUnit(pu.getPersistenceUnitName()))
-                .findFirst();
-        boolean enableDefaultBlazePersistence = (defaultPersistenceUnit.isPresent()
-                && blazePersistenceConfig.blazePersistenceInstances.isEmpty())
-                || blazePersistenceConfig.defaultBlazePersistence.isAnyPropertySet();
-        boolean hasPackagesInQuarkusConfig = hasPackagesInQuarkusConfig(blazePersistenceConfig);
-        Collection<AnnotationInstance> packageLevelBlazePersistenceInstanceAnnotations = getPackageLevelBlazePersistenceInstanceAnnotations(
-                indexBuildItem.getIndex()
-        );
-        Map<String, Set<String>> entityViewClassesPerBlazePersistenceInstance;
-        Map<String, Set<String>> entityViewListenerClassesPerBlazePersistenceInstance;
-        Set<String> entityViewClassesForDefaultBlazePersistenceInstance;
-        Set<String> entityViewListenerClassesForDefaultBlazePersistenceInstance;
-        if (enableDefaultBlazePersistence && blazePersistenceConfig.blazePersistenceInstances.isEmpty() &&
-                !hasPackagesInQuarkusConfig && packageLevelBlazePersistenceInstanceAnnotations.isEmpty()) {
-            // Only the default Blaze-Persistence instance exists and no package or annotation configuration is specified.
-            // In this case we just assign all entity views to the default instance.
-            entityViewClassesPerBlazePersistenceInstance = Collections.emptyMap();
-            entityViewListenerClassesPerBlazePersistenceInstance = Collections.emptyMap();
-            entityViewClassesForDefaultBlazePersistenceInstance = entityViewsBuildItem.getEntityViewClassNames();
-            entityViewListenerClassesForDefaultBlazePersistenceInstance = entityViewListenersBuildItem.getEntityViewListenerClassNames();
-        } else {
-            Map<String, Set<String>> blazePersistenceInstanceToPackagesMapping = mapBlazePersistenceInstancesToPackages(
-                blazePersistenceConfig,
-                enableDefaultBlazePersistence,
-                hasPackagesInQuarkusConfig,
-                packageLevelBlazePersistenceInstanceAnnotations
-            );
-            entityViewClassesPerBlazePersistenceInstance = buildClassesToBlazePersistenceInstanceMapping(
-                    blazePersistenceInstanceToPackagesMapping,
-                    entityViewsBuildItem.getEntityViewClassNames(),
-                    indexBuildItem.getIndex()
-            );
-            entityViewListenerClassesPerBlazePersistenceInstance = buildClassesToBlazePersistenceInstanceMapping(
-                    blazePersistenceInstanceToPackagesMapping,
-                    entityViewListenersBuildItem.getEntityViewListenerClassNames(),
-                    indexBuildItem.getIndex()
-            );
-            entityViewClassesForDefaultBlazePersistenceInstance = entityViewClassesPerBlazePersistenceInstance
-                .getOrDefault(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, Collections.emptySet());
-            entityViewListenerClassesForDefaultBlazePersistenceInstance = entityViewListenerClassesPerBlazePersistenceInstance
-                .getOrDefault(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, Collections.emptySet());
-        }
-
-        if (enableDefaultBlazePersistence) {
-            blazePersistenceDescriptorBuildItemProducer.produce(new BlazePersistenceInstanceDescriptorBuildItem(
-                    BlazePersistenceInstanceUtil.DEFAULT_BLAZE_PERSISTENCE_NAME,
-                    blazePersistenceConfig.defaultBlazePersistence,
-                    entityViewClassesForDefaultBlazePersistenceInstance,
-                    entityViewListenerClassesForDefaultBlazePersistenceInstance));
-        } else if ((!blazePersistenceConfig.defaultBlazePersistence.persistenceUnit.isPresent()
-                        || PersistenceUnitUtil.isDefaultPersistenceUnit(blazePersistenceConfig.defaultBlazePersistence.persistenceUnit.get()))
-                && !defaultPersistenceUnit.isPresent()) {
-            if (!entityViewClassesForDefaultBlazePersistenceInstance.isEmpty()) {
-                LOG.warn(
-                        "Entity view classes are defined for the default Blaze-Persistence instance but no default persistence unit found: the default Blaze-Persistence instance will not be created.");
-            }
-            if (!entityViewListenerClassesForDefaultBlazePersistenceInstance.isEmpty()) {
-                LOG.warn(
-                        "Entity view listener classes are defined for the default Blaze-Persistence instance but no default persistence unit found: the default Blaze-Persistence instance will not be created.");
-            }
-        }
-
-        for (Map.Entry<String, BlazePersistenceInstanceConfiguration> namedInstance : blazePersistenceConfig.blazePersistenceInstances
-                .entrySet()) {
-            BlazePersistenceInstanceConfiguration blazePersistenceInstanceConfig = namedInstance.getValue();
-            if (blazePersistenceInstanceConfig.persistenceUnit.isPresent()) {
-                persistenceUnitDescriptors.stream()
-                        .filter(descriptor -> blazePersistenceInstanceConfig.persistenceUnit.get().equals(descriptor.getPersistenceUnitName()))
-                        .findFirst()
-                        .orElseThrow(() -> new ConfigurationException(
-                                String.format("The persistence unit '%1$s' is not configured but the Blaze-Persistence instance '%2$s' uses it.",
-                                        blazePersistenceInstanceConfig.persistenceUnit.get(), namedInstance.getKey())));
-            } else {
-                if (!BlazePersistenceInstanceUtil.isDefaultBlazePersistenceInstance(namedInstance.getKey())) {
-                    // if it's not the default Blaze-Persistence instance, we mandate a persistence unit to prevent common errors
-                    throw new ConfigurationException(
-                            String.format("Persistence unit must be defined for Blaze-Persistence instance '%s'.", namedInstance.getKey()));
-                }
-
-                if (!defaultPersistenceUnit.isPresent()) {
-                    throw new ConfigurationException(
-                            String.format("The default persistence unit is not configured but the Blaze-Persistence instance '%s' uses it.",
-                                    namedInstance.getKey()));
-                }
-            }
-
-            blazePersistenceDescriptorBuildItemProducer.produce(new BlazePersistenceInstanceDescriptorBuildItem(
-                    namedInstance.getKey(),
-                    namedInstance.getValue(),
-                    entityViewClassesPerBlazePersistenceInstance.getOrDefault(namedInstance.getKey(), Collections.emptySet()),
-                    entityViewListenerClassesPerBlazePersistenceInstance.getOrDefault(namedInstance.getKey(), Collections.emptySet())));
-        }
-    }
-
-    @BuildStep
-    void reflection(EntityViewsBuildItem entityViewsBuildItem,
-                    BuildProducer<ReflectiveClassBuildItem> reflectionProducer) {
-        reflectionProducer.produce(new ReflectiveClassBuildItem(true, true, ValuesEntity.class));
-        reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, ConcurrentHashMapExpressionCache.class));
-        reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, "com.blazebit.persistence.integration.hibernate.CustomOneToManyPersister"));
-        reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, "com.blazebit.persistence.integration.hibernate.CustomBasicCollectionPersister"));
-        // Needed by AbstractHibernateEntityManagerFactoryIntegrator
-        reflectionProducer.produce(ReflectiveClassBuildItem.builder("org.hibernate.dialect.function.SQLFunctionRegistry")
-                .fields(true)
-                .finalFieldsWritable(true)
-                .build()
-        );
-        reflectionProducer.produce(ReflectiveClassBuildItem.builder("org.hibernate.dialect.Dialect")
-                .fields(true)
-                .finalFieldsWritable(true)
-                .build()
-        );
-        // Needed by HibernateExtendedQuerySupport
-        reflectionProducer.produce(ReflectiveClassBuildItem.builder(
-                "org.hibernate.hql.internal.ast.exec.MultiTableUpdateExecutor",
-                "org.hibernate.hql.internal.ast.exec.BasicExecutor",
-                "org.hibernate.hql.internal.ast.exec.DeleteExecutor",
-                "org.hibernate.hql.internal.ast.exec.MultiTableDeleteExecutor",
-                "org.hibernate.hql.internal.ast.exec.IdSubselectUpdateExecutor",
-                "org.hibernate.hql.internal.ast.exec.SimpleUpdateExecutor",
-                "org.hibernate.hql.internal.ast.exec.InsertExecutor")
-                .fields(true)
-                .finalFieldsWritable(true)
-                .build()
-        );
-        reflectionProducer.produce(ReflectiveClassBuildItem.builder(
-                "org.hibernate.hql.internal.classic.QueryTranslatorImpl",
-                "org.hibernate.hql.internal.ast.QueryTranslatorImpl")
-                .fields(true)
-                .build()
-        );
-        // add entity view model classes generated by annotation processor
-        for (String entityViewClassName : entityViewsBuildItem.getEntityViewClassNames()) {
-            // We need entity view methods because we might call them as listeners but we also need them for metadata discovery
-            reflectionProducer.produce(new ReflectiveClassBuildItem(true, true, false, entityViewClassName));
-            String baseName = entityViewClassName.replace("$", "");
-            // For entity view implementations we need full reflection because instances of these classes are usually serialized
-            reflectionProducer.produce(ReflectiveClassBuildItem.builder(baseName + "Impl")
-                    .constructors(true)
-                    .fields(true)
-                    .methods(true)
-                    .finalFieldsWritable(true)
-                    .build()
-            );
-            // For static metamodel classes, we only need the fields
-            reflectionProducer.produce(new ReflectiveClassBuildItem(false, false, true, baseName + "_"));
-            // For Relation classes, we only need the constructor
-            for (String generatedStaticModelClass : Arrays.asList(baseName + "Relation", baseName + "MultiRelation")) {
-                reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, generatedStaticModelClass));
-            }
-            // For builder classes, we only need constructors
-            try {
-                Class<?> builderClass = Thread.currentThread().getContextClassLoader().loadClass(baseName + "Builder");
-                reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, builderClass.getName()));
-                for (Class<?> builderSubClass : builderClass.getDeclaredClasses()) {
-                    reflectionProducer.produce(new ReflectiveClassBuildItem(true, false, false, builderSubClass.getName()));
-                }
-
-            } catch (ClassNotFoundException ex) {
-                // Ignore
-            }
-        }
-
-        // add fromString methods from entity view id types
-        EntityViewConfiguration evc = EntityViews.createDefaultConfiguration();
-        for (String entityViewClassName : entityViewsBuildItem.getEntityViewClassNames()) {
-            try {
-                evc.addEntityView(Thread.currentThread().getContextClassLoader().loadClass(entityViewClassName));
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        for (EntityViewMapping entityViewMapping : evc.getEntityViewMappings()) {
-            if (entityViewMapping.getIdAttribute() != null) {
-                reflectionProducer.produce(ReflectiveClassBuildItem.builder(entityViewMapping.getIdAttribute().getDeclaredType())
-                        .constructors(true)
-                        .methods(true)
-                        .build()
-                );
-            }
-        }
-    }
-
-    private List<String> getGeneratedEntityViewModelClassNames(String entityViewClassName) {
-        return Arrays.asList(
-                entityViewClassName.replace("$", "") + "_",
-                entityViewClassName.replace("$", "") + "Relation",
-                entityViewClassName.replace("$", "") + "MultiRelation",
-                entityViewClassName.replace("$", "") + "Builder",
-                entityViewClassName.replace("$", "") + "Builder$Init"
-        );
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem criteriaBuilderConfigurationProvider() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.spi.CriteriaBuilderConfigurationProvider",
-                "com.blazebit.persistence.impl.CriteriaBuilderConfigurationProviderImpl");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem hibernateMetadataContributor() {
-        return new ServiceProviderBuildItem("org.hibernate.boot.spi.MetadataContributor",
-                "com.blazebit.persistence.integration.hibernate.Hibernate5MetadataContributor",
-                "com.blazebit.persistence.integration.hibernate.Hibernate53MetadataContributor",
-                "com.blazebit.persistence.integration.hibernate.Hibernate56MetadataContributor",
-                "com.blazebit.persistence.integration.hibernate.Hibernate60MetadataContributor");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem hibernateTypeContributor() {
-        return new ServiceProviderBuildItem("org.hibernate.metamodel.spi.TypeContributor",
-                "com.blazebit.persistence.integration.hibernate.Hibernate53Integrator",
-                "com.blazebit.persistence.integration.hibernate.Hibernate56Integrator");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem hibernateAccess() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.integration.hibernate.base.HibernateAccess",
-                "com.blazebit.persistence.integration.hibernate.Hibernate53Access",
-                "com.blazebit.persistence.integration.hibernate.Hibernate56Access");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem entityManagerFactoryIntegrator() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.spi.EntityManagerFactoryIntegrator",
-                "com.blazebit.persistence.integration.hibernate.Hibernate53EntityManagerFactoryIntegrator",
-                "com.blazebit.persistence.integration.hibernate.Hibernate56EntityManagerFactoryIntegrator");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem transactionAccessFactory() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.view.spi.TransactionAccessFactory",
-                "com.blazebit.persistence.integration.hibernate.Hibernate4TransactionAccessFactory",
-                "com.blazebit.persistence.integration.hibernate.Hibernate5TransactionAccessFactory");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem extendedQuerySupport() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.spi.ExtendedQuerySupport",
-                "com.blazebit.persistence.integration.hibernate.base.HibernateExtendedQuerySupport");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem blazeCriteriaBuilderFactory() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory",
-                "com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderFactoryImpl");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem entityViewConfigurationProvider() {
-        return new ServiceProviderBuildItem("com.blazebit.persistence.view.spi.EntityViewConfigurationProvider",
-                "com.blazebit.persistence.view.impl.EntityViewConfigurationProviderImpl");
-    }
-
-    private static Map<String, Set<String>> buildClassesToBlazePersistenceInstanceMapping(Map<String, Set<String>> blazePersistenceInstanceToPackageMapping,
-                                                                                          Set<String> classes, IndexView index) {
-        Map<String, Set<String>> entityViewClassesPerBlazePersistenceInstance = new HashMap<>();
-        Set<String> entityViewClassesWithBlazePersistenceInstanceAnnotations = new TreeSet<>();
-
-        for (String entityViewClassName : classes) {
-            ClassInfo entityViewClassInfo = index.getClassByName(DotName.createSimple(entityViewClassName));
-            Set<String> relatedEntityViewClassNames = Collections.emptySet();//getRelatedEntityViewClassNames(index, entityViews.getEntityViewClassNames(), entityViewClassInfo);
-
-            if (entityViewClassInfo != null && (entityViewClassInfo.classAnnotation(BLAZE_PERSISTENCE_INSTANCE) != null
-                    || entityViewClassInfo.classAnnotation(BLAZE_PERSISTENCE_INSTANCE_REPEATABLE_CONTAINER) != null)) {
-                entityViewClassesWithBlazePersistenceInstanceAnnotations.add(entityViewClassInfo.name().toString());
-            }
-
-            for (Map.Entry<String, Set<String>> packageRuleEntry : blazePersistenceInstanceToPackageMapping.entrySet()) {
-                if (entityViewClassName.startsWith(packageRuleEntry.getKey())) {
-                    for (String blazePersistenceInstanceName : packageRuleEntry.getValue()) {
-                        entityViewClassesPerBlazePersistenceInstance.computeIfAbsent(blazePersistenceInstanceName, (key) -> new HashSet<>())
-                                .add(entityViewClassName);
-
-                        // also add the hierarchy to the persistence unit
-                        // we would need to add all the underlying model to it but adding the hierarchy
-                        // is necessary for Panache as we need to add PanacheEntity to the PU
-                        for (String relatedEntityViewClassName : relatedEntityViewClassNames) {
-                            entityViewClassesPerBlazePersistenceInstance.get(blazePersistenceInstanceName).add(relatedEntityViewClassName);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!entityViewClassesWithBlazePersistenceInstanceAnnotations.isEmpty()) {
-            throw new IllegalStateException(String.format(
-                    "@BlazePersistenceInstance annotations are not supported at the class level on entity view classes:\n\t- %s\nUse the `.packages` configuration property or package-level annotations instead.",
-                    String.join("\n\t- ", entityViewClassesWithBlazePersistenceInstanceAnnotations)));
-        }
-
-        Set<String> affectedEntityViewClasses = entityViewClassesPerBlazePersistenceInstance.values().stream().flatMap(Set::stream)
-                .collect(Collectors.toSet());
-        Set<String> unaffectedEntityViewClasses = classes.stream()
-                .filter(c -> !affectedEntityViewClasses.contains(c))
-                .collect(Collectors.toCollection(TreeSet::new));
-        if (!unaffectedEntityViewClasses.isEmpty()) {
-            LOG.warnf("Could not find a suitable Blaze-Persistence instance for entity view classes:\n\t- %s",
-                    String.join("\n\t- ", unaffectedEntityViewClasses));
-        }
-
-        return entityViewClassesPerBlazePersistenceInstance;
-    }
-
-    private static Map<String, Set<String>> mapBlazePersistenceInstancesToPackages(BlazePersistenceConfiguration blazePersistenceConfig,
-                                                                                   boolean enableDefaultBlazePersistenceInstance,
-                                                                                   boolean hasPackagesInQuarkusConfig,
-                                                                                   Collection<AnnotationInstance> packageLevelBlazePersistenceInstanceAnnotations) {
-        Map<String, Set<String>> packageRules = new HashMap<>();
-        if (hasPackagesInQuarkusConfig) {
-            // Config based packages have priorities over annotations.
-            // As long as there is one defined, annotations are ignored.
-            if (!packageLevelBlazePersistenceInstanceAnnotations.isEmpty()) {
-                LOG.warn(
-                        "Mixing Quarkus configuration and @BlazePersistenceInstance annotations to define the Blaze-Persistence instances is not supported. Ignoring the annotations.");
-            }
-
-            // handle the default persistence unit
-            if (enableDefaultBlazePersistenceInstance) {
-                if (!blazePersistenceConfig.defaultBlazePersistence.packages.isPresent()) {
-                    throw new ConfigurationException("Packages must be configured for the default Blaze-Persistence instance.");
-                }
-
-                for (String packageName : blazePersistenceConfig.defaultBlazePersistence.packages.get()) {
-                    packageRules.computeIfAbsent(normalizePackage(packageName), p -> new HashSet<>())
-                            .add(BlazePersistenceInstanceUtil.DEFAULT_BLAZE_PERSISTENCE_NAME);
-                }
-            }
-
-            // handle the named Blaze-Persistence instances
-            for (Map.Entry<String, BlazePersistenceInstanceConfiguration> candidateBlazePersistenceInstanceEntry : blazePersistenceConfig.blazePersistenceInstances
-                    .entrySet()) {
-                String candidateBlazePersistenceInstanceName = candidateBlazePersistenceInstanceEntry.getKey();
-
-                Set<String> candidateBlazePersistenceInstancePackages = candidateBlazePersistenceInstanceEntry.getValue().packages
-                        .orElseThrow(() -> new ConfigurationException(String.format(
-                                "Packages must be configured for Blaze-Persistence instance '%s'.", candidateBlazePersistenceInstanceName)));
-
-                for (String packageName : candidateBlazePersistenceInstancePackages) {
-                    packageRules.computeIfAbsent(normalizePackage(packageName), p -> new HashSet<>())
-                            .add(candidateBlazePersistenceInstanceName);
-                }
-            }
-        } else if (!packageLevelBlazePersistenceInstanceAnnotations.isEmpty()) {
-            for (AnnotationInstance packageLevelBlazePersistenceInstanceAnnotation : packageLevelBlazePersistenceInstanceAnnotations) {
-                String className = packageLevelBlazePersistenceInstanceAnnotation.target().asClass().name().toString();
-                String packageName;
-                if (className == null || className.isEmpty() || className.indexOf('.') == -1) {
-                    packageName = "";
-                } else {
-                    packageName = normalizePackage(className.substring(0, className.lastIndexOf('.')));
-                }
-
-                String blazePersistenceInstanceName = packageLevelBlazePersistenceInstanceAnnotation.value().asString();
-                if (blazePersistenceInstanceName != null && !blazePersistenceInstanceName.isEmpty()) {
-                    packageRules.computeIfAbsent(packageName, p -> new HashSet<>())
-                            .add(blazePersistenceInstanceName);
-                }
-            }
-        } else {
-            throw new ConfigurationException(
-                    "Multiple Blaze-Persistence instances are defined but the entity views are not mapped to them. You should either use the .packages Quarkus configuration property or package-level @BlazePersistenceInstance annotations.");
-        }
-        return packageRules;
-    }
-
-    private static boolean hasPackagesInQuarkusConfig(BlazePersistenceConfiguration blazePersistenceConfig) {
-        if (blazePersistenceConfig.defaultBlazePersistence.packages.isPresent()) {
-            return true;
-        }
-
-        for (BlazePersistenceInstanceConfiguration blazePersistenceInstanceConfig : blazePersistenceConfig.blazePersistenceInstances.values()) {
-            if (blazePersistenceInstanceConfig.packages.isPresent()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static Collection<AnnotationInstance> getPackageLevelBlazePersistenceInstanceAnnotations(IndexView index) {
-        Collection<AnnotationInstance> blazePersistenceInstanceAnnotations = index.getAnnotationsWithRepeatable(BLAZE_PERSISTENCE_INSTANCE, index);
-        Collection<AnnotationInstance> packageLevelBlazePersistenceInstanceAnnotations = new ArrayList<>();
-
-        for (AnnotationInstance blazePersistenceInstanceAnnotation : blazePersistenceInstanceAnnotations) {
-            if (blazePersistenceInstanceAnnotation.target().kind() != AnnotationTarget.Kind.CLASS) {
-                continue;
-            }
-
-            if (!"package-info".equals(blazePersistenceInstanceAnnotation.target().asClass().simpleName())) {
-                continue;
-            }
-            packageLevelBlazePersistenceInstanceAnnotations.add(blazePersistenceInstanceAnnotation);
-        }
-
-        return packageLevelBlazePersistenceInstanceAnnotations;
-    }
-
-    private static String normalizePackage(String pakkage) {
-        if (pakkage.endsWith(".")) {
-            return pakkage;
-        }
-        return pakkage + ".";
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewConfigurationBuildItem.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewConfigurationBuildItem.java
deleted file mode 100644
index 5cf5e60419..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewConfigurationBuildItem.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import io.quarkus.builder.item.SimpleBuildItem;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public final class EntityViewConfigurationBuildItem extends SimpleBuildItem {
-    private final EntityViewConfiguration entityViewConfiguration;
-
-    public EntityViewConfigurationBuildItem(EntityViewConfiguration entityViewConfiguration) {
-        this.entityViewConfiguration = entityViewConfiguration;
-    }
-
-    public EntityViewConfiguration getEntityViewConfiguration() {
-        return entityViewConfiguration;
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewJandexScavenger.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewJandexScavenger.java
deleted file mode 100644
index a2623ec6df..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewJandexScavenger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.EntityViewListener;
-import com.blazebit.persistence.view.EntityViewListeners;
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-
-import java.util.Collection;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class EntityViewJandexScavenger {
-    private static final DotName ENTITY_VIEW = DotName.createSimple(EntityView.class.getName());
-    private static final DotName ENTITY_VIEW_LISTENER = DotName.createSimple(EntityViewListener.class.getName());
-    private static final DotName ENTITY_VIEW_LISTENERS = DotName.createSimple(EntityViewListeners.class.getName());
-
-    private final IndexView indexView;
-
-    public EntityViewJandexScavenger(IndexView indexView) {
-        this.indexView = indexView;
-    }
-
-    public EntityViewsBuildItem discoverAndRegisterEntityViews() {
-        EntityViewsBuildItem entityViewsBuildItem = new EntityViewsBuildItem();
-
-        Collection<AnnotationInstance> entityViewAnnotations = indexView.getAnnotations(ENTITY_VIEW);
-
-        if (entityViewAnnotations != null) {
-            for (AnnotationInstance annotation : entityViewAnnotations) {
-                ClassInfo klass = annotation.target().asClass();
-                entityViewsBuildItem.addEntityViewClass(klass.name().toString());
-            }
-        }
-
-        return entityViewsBuildItem;
-    }
-
-    public EntityViewListenersBuildItem discoverAndRegisterEntityViewListeners() {
-        EntityViewListenersBuildItem entityViewListenersBuildItem = new EntityViewListenersBuildItem();
-
-        Collection<AnnotationInstance> entityViewListenerAnnotations = indexView.getAnnotations(ENTITY_VIEW_LISTENER);
-
-        if (entityViewListenerAnnotations != null) {
-            for (AnnotationInstance annotation : entityViewListenerAnnotations) {
-                ClassInfo klass = annotation.target().asClass();
-                entityViewListenersBuildItem.addEntityViewListenerClass(klass.name().toString());
-            }
-        }
-
-        Collection<AnnotationInstance> entityViewListenersAnnotations = indexView.getAnnotations(ENTITY_VIEW_LISTENERS);
-
-        if (entityViewListenersAnnotations != null) {
-            for (AnnotationInstance annotation : entityViewListenersAnnotations) {
-                ClassInfo klass = annotation.target().asClass();
-                entityViewListenersBuildItem.addEntityViewListenerClass(klass.name().toString());
-            }
-        }
-
-        return entityViewListenersBuildItem;
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewListenersBuildItem.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewListenersBuildItem.java
deleted file mode 100644
index 5822f1d265..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewListenersBuildItem.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import io.quarkus.builder.item.SimpleBuildItem;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public final class EntityViewListenersBuildItem extends SimpleBuildItem {
-    private final Set<String> entityViewListenerClassNames = new HashSet<>();
-
-    void addEntityViewListenerClass(final String className) {
-        entityViewListenerClassNames.add(className);
-    }
-
-    public Set<String> getEntityViewListenerClassNames() {
-        return entityViewListenerClassNames;
-    }
-}
diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewsBuildItem.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewsBuildItem.java
deleted file mode 100644
index bbcadcfa6f..0000000000
--- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/EntityViewsBuildItem.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import io.quarkus.builder.item.SimpleBuildItem;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public final class EntityViewsBuildItem extends SimpleBuildItem {
-    private final Set<String> entityViewClassNames = new HashSet<>();
-
-    void addEntityViewClass(final String className) {
-        entityViewClassNames.add(className);
-    }
-
-    public Set<String> getEntityViewClassNames() {
-        return entityViewClassNames;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/HotReloadTest.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/HotReloadTest.java
deleted file mode 100644
index cea5a41465..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/HotReloadTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Document;
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Person;
-import com.blazebit.persistence.integration.quarkus.deployment.resource.DocumentResource;
-import com.blazebit.persistence.integration.quarkus.deployment.resource.PersonResource;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentCreateView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.PersonCreateView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.PersonView;
-import io.quarkus.test.QuarkusDevModeTest;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.path.json.JsonPath;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class HotReloadTest {
-
-    @RegisterExtension
-    final static QuarkusDevModeTest RUNNER = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> {
-                        Class<?>[] views = {DocumentView.class, DocumentCreateView.class};
-                        JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class)
-                                .addClasses(Document.class, Person.class)
-                                .addClasses(views)
-                                .addClasses(DocumentResource.class)
-                                .addAsResource("application.properties")
-                                .addAsResource("META-INF/persistence.xml");
-                        for (Class<?> view : views) {
-                            addStaticGeneratedClasses(javaArchive, view);
-                        }
-
-                        return javaArchive;
-                    }
-            );
-
-    private static void addStaticGeneratedClasses(JavaArchive javaArchive, Class<?> view) {
-        try {
-            javaArchive.addClasses(
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "_"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Relation"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "MultiRelation"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Impl"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Builder")
-            );
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        }
-    }
-
-    @Test
-    public void testAddNewEntityView() {
-        String documentName = "test1";
-        System.out.println(RestAssured.given().body("{ \"name\": \"" + documentName + "\" }").contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then().extract().asString());
-        JsonPath result = RestAssured.given().body("{ \"name\": \"" + documentName + "\" }").contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then().contentType(ContentType.JSON).extract().response().jsonPath();
-        assertEquals(documentName, result.getString("name"));
-
-        RUNNER.addSourceFile(PersonCreateView.class);
-        RUNNER.addSourceFile(PersonView.class);
-        RUNNER.addSourceFile(PersonResource.class);
-
-        String personName = "person1";
-        result = RestAssured.given().body("{ \"name\": \"" + personName + "\" }").contentType(ContentType.JSON)
-                .when().post("/persons")
-                .then().contentType(ContentType.JSON).extract().response().jsonPath();
-        assertEquals(personName, result.getString("name"));
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/QuarkusTest.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/QuarkusTest.java
deleted file mode 100644
index 45a1f21273..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/QuarkusTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment;
-
-import com.blazebit.persistence.integration.jackson.EntityViewAwareObjectMapper;
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Document;
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Person;
-import com.blazebit.persistence.integration.quarkus.deployment.listener.DocumentPostPersistEntityListener;
-import com.blazebit.persistence.integration.quarkus.deployment.resource.DocumentResource;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentCreateView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentView;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.IdMapping;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import io.quarkus.test.QuarkusUnitTest;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class QuarkusTest {
-
-    @RegisterExtension
-    final static QuarkusUnitTest RUNNER = new QuarkusUnitTest()
-            .setArchiveProducer(() -> {
-                        Class<?>[] views = {DocumentView.class, DocumentCreateView.class};
-                        JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class)
-                                .addClasses(Document.class, Person.class)
-                                .addClasses(views)
-                                .addClasses(DocumentPostPersistEntityListener.class)
-                                .addClasses(DocumentResource.class)
-                                .addAsResource("application.properties")
-                                .addAsResource("META-INF/persistence.xml");
-                        for (Class<?> view : views) {
-                            addStaticGeneratedClasses(javaArchive, view);
-                        }
-
-                        return javaArchive;
-                    }
-            );
-
-    private static void addStaticGeneratedClasses(JavaArchive javaArchive, Class<?> view) {
-        try {
-            javaArchive.addClasses(
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "_"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Relation"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "MultiRelation"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Impl"),
-                    view.getClassLoader().loadClass(view.getPackage().getName() + "." + view.getSimpleName().replace("$", "") + "Builder")
-            );
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        }
-    }
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    @Inject
-    private EntityManager em;
-    @Inject
-    private EntityViewManager evm;
-
-    @PostConstruct
-    void init() {
-        new EntityViewAwareObjectMapper(evm, objectMapper, null);
-    }
-
-    @Test
-    @Transactional
-    public void simpleTest() {
-        Document d = new Document();
-        em.persist(d);
-        DocumentView documentView = evm.find(em, DocumentView.class, d.getId());
-        assertEquals(d.getId(), documentView.getId());
-    }
-
-    @Test
-    public void testDocumentResource() throws JsonProcessingException {
-        DocumentCreateView documentCreateView = evm.create(DocumentCreateView.class);
-        documentCreateView.setName("test1");
-        DocumentView result = objectMapper.readValue(RestAssured.given().body(toJsonWithoutId(documentCreateView)).contentType(ContentType.JSON)
-                .when().post("/documents")
-                .then().contentType(ContentType.JSON).extract().response().asString(), DocumentView.class);
-        assertEquals(documentCreateView.getName(), result.getName());
-        assertEquals(1, DocumentPostPersistEntityListener.PERSIST_COUNTER);
-    }
-
-    private byte[] toJsonWithoutId(Object entityView) throws JsonProcessingException {
-        VisibilityChecker<?> old = objectMapper.getVisibilityChecker();
-        objectMapper.setVisibility(new VisibilityChecker.Std(JsonAutoDetect.Visibility.DEFAULT) {
-            @Override
-            public boolean isGetterVisible(AnnotatedMethod m) {
-                return !m.hasAnnotation(IdMapping.class) && super.isGetterVisible(m);
-            }
-        });
-        byte[] result = objectMapper.writeValueAsBytes(entityView);
-        objectMapper.setVisibility(old);
-        return result;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Document.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Document.java
deleted file mode 100644
index b9ee5fa354..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Document.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Entity
-public class Document implements Serializable {
-
-    private Long id;
-    private String name;
-    private String description;
-    private long age;
-    private Person owner;
-
-    public Document() {
-    }
-
-    public Document(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Person.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Person.java
deleted file mode 100644
index b184e042ec..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/entity/Person.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment.entity;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * @author Christian Beikov
- * @author Moritz Becker
- * @since 1.2.0
- */
-@Entity
-public class Person implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private UUID id;
-    private String name;
-    private long age;
-    private Set<Document> documents = new HashSet<>(0);
-
-    public Person() {
-    }
-
-    public Person(String name) {
-        this.name = name;
-    }
-
-    public Person(String name, long age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    @Id
-    @GeneratedValue
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    @Basic(optional = false)
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @OneToMany(mappedBy = "owner")
-    public Set<Document> getDocuments() {
-        return documents;
-    }
-
-    public void setDocuments(Set<Document> documents) {
-        this.documents = documents;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/listener/DocumentPostPersistEntityListener.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/listener/DocumentPostPersistEntityListener.java
deleted file mode 100644
index b06a2ef315..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/listener/DocumentPostPersistEntityListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.listener;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Document;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentCreateView;
-import com.blazebit.persistence.view.EntityViewListener;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.PostPersistEntityListener;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityViewListener
-public class DocumentPostPersistEntityListener implements PostPersistEntityListener<DocumentCreateView, Document> {
-
-    public static volatile int PERSIST_COUNTER = 0;
-
-    @Override
-    public void postPersist(EntityViewManager entityViewManager, EntityManager entityManager, DocumentCreateView view, Document entity) {
-        PERSIST_COUNTER++;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesPackageAnnotationsTest.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesPackageAnnotationsTest.java
deleted file mode 100644
index 1342d82dcf..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesPackageAnnotationsTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Car;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Desk;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.car.CarView;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.desk.DeskView;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.shared.SharedEntityView;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
-import com.blazebit.persistence.view.EntityViewManager;
-import io.quarkus.hibernate.orm.PersistenceUnit;
-import io.quarkus.test.QuarkusUnitTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-public class MultiBlazePersistenceInstancesPackageAnnotationsTest {
-
-    @RegisterExtension
-    final static QuarkusUnitTest RUNNER = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Desk.class, Car.class, SharedEntity.class)
-                    .addPackages(true, "com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation")
-                    .addAsResource("application-multiple-instances-annotations.properties", "application.properties")
-                    .addAsResource("META-INF/persistence-multiple-persistence-units.xml", "META-INF/persistence.xml")
-            );
-
-    @Inject
-    @PersistenceUnit("CarPU")
-    EntityManager carEntityManager;
-    @Inject
-    @PersistenceUnit("DeskPU")
-    EntityManager deskEntityManager;
-    @Inject
-    @BlazePersistenceInstance("CarBPInstance")
-    CriteriaBuilderFactory carCbf;
-    @Inject
-    @BlazePersistenceInstance("DeskBPInstance")
-    CriteriaBuilderFactory deskCbf;
-    @Inject
-    @BlazePersistenceInstance("CarBPInstance")
-    EntityViewManager carEvm;
-    @Inject
-    @BlazePersistenceInstance("DeskBPInstance")
-    EntityViewManager deskEvm;
-
-    @Test
-    @Transactional
-    public void testCar() {
-        SharedEntity shared = new SharedEntity("Shared");
-        Car car = new Car("BMW");
-        Desk desk = new Desk("Wooden desk");
-
-        // test EntityManager
-        assertThatThrownBy(() -> carEntityManager.persist(desk)).hasMessageContaining("Unknown entity");
-        carEntityManager.persist(car);
-        carEntityManager.persist(shared);
-
-        // test CriteriaBuilderFactory
-        assertNotNull(carCbf.create(carEntityManager, Car.class).where("id").eq(car.getId()).getSingleResult());
-        assertNotNull(carCbf.create(carEntityManager, SharedEntity.class).where("id").eq(shared.getId()).getSingleResult());
-        assertThatThrownBy(() -> carCbf.create(carEntityManager, Desk.class).where("id").eq(desk.getId()).getSingleResult());
-
-        // test EntityViewManager
-        assertEquals("BMW", carEvm.find(carEntityManager, CarView.class, car.getId()).getName());
-        assertEquals("Shared", carEvm.find(carEntityManager, SharedEntityView.class, shared.getId()).getName());
-        assertThatThrownBy(() -> carEvm.find(carEntityManager, Desk.class, desk.getId()));
-    }
-
-    @Test
-    @Transactional
-    public void testDesk() {
-        SharedEntity shared = new SharedEntity("Shared");
-        Car car = new Car("BMW");
-        Desk desk = new Desk("Wooden desk");
-
-        // test EntityManager
-        assertThatThrownBy(() -> deskEntityManager.persist(car)).hasMessageContaining("Unknown entity");
-        deskEntityManager.persist(desk);
-        deskEntityManager.persist(shared);
-
-        // test CriteriaBuilderFactory
-        assertNotNull(deskCbf.create(deskEntityManager, Desk.class).where("id").eq(desk.getId()).getSingleResult());
-        assertNotNull(deskCbf.create(deskEntityManager, SharedEntity.class).where("id").eq(shared.getId()).getSingleResult());
-        assertThatThrownBy(() -> deskCbf.create(deskEntityManager, Car.class).where("id").eq(car.getId()).getSingleResult());
-
-        // test EntityViewManager
-        assertEquals("Wooden desk", deskEvm.find(deskEntityManager, DeskView.class, desk.getId()).getName());
-        assertEquals("Shared", deskEvm.find(deskEntityManager, SharedEntityView.class, shared.getId()).getName());
-        assertThatThrownBy(() -> deskEvm.find(deskEntityManager, Car.class, car.getId()));
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesTest.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesTest.java
deleted file mode 100644
index 085daa53e7..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/MultiBlazePersistenceInstancesTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Car;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Desk;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.car.CarView;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.desk.DeskView;
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.shared.SharedEntityView;
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
-import com.blazebit.persistence.view.EntityViewManager;
-import io.quarkus.hibernate.orm.PersistenceUnit;
-import io.quarkus.test.QuarkusUnitTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-public class MultiBlazePersistenceInstancesTest {
-
-    @RegisterExtension
-    final static QuarkusUnitTest RUNNER = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Desk.class, Car.class, SharedEntity.class)
-                    .addPackages(true, "com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config")
-                    .addAsResource("application-multiple-instances.properties", "application.properties")
-                    .addAsResource("META-INF/persistence-multiple-persistence-units.xml", "META-INF/persistence.xml")
-            );
-
-    @Inject
-    @PersistenceUnit("CarPU")
-    EntityManager carEntityManager;
-    @Inject
-    @PersistenceUnit("DeskPU")
-    EntityManager deskEntityManager;
-    @Inject
-    @BlazePersistenceInstance("CarBPInstance")
-    CriteriaBuilderFactory carCbf;
-    @Inject
-    @BlazePersistenceInstance("DeskBPInstance")
-    CriteriaBuilderFactory deskCbf;
-    @Inject
-    @BlazePersistenceInstance("CarBPInstance")
-    EntityViewManager carEvm;
-    @Inject
-    @BlazePersistenceInstance("DeskBPInstance")
-    EntityViewManager deskEvm;
-
-    @Test
-    @Transactional
-    public void testCar() {
-        SharedEntity shared = new SharedEntity("Shared");
-        Car car = new Car("BMW");
-        Desk desk = new Desk("Wooden desk");
-
-        // test EntityManager
-        assertThatThrownBy(() -> carEntityManager.persist(desk)).hasMessageContaining("Unknown entity");
-        carEntityManager.persist(car);
-        carEntityManager.persist(shared);
-
-        // test CriteriaBuilderFactory
-        assertNotNull(carCbf.create(carEntityManager, Car.class).where("id").eq(car.getId()).getSingleResult());
-        assertNotNull(carCbf.create(carEntityManager, SharedEntity.class).where("id").eq(shared.getId()).getSingleResult());
-        assertThatThrownBy(() -> carCbf.create(carEntityManager, Desk.class).where("id").eq(desk.getId()).getSingleResult());
-
-        // test EntityViewManager
-        assertEquals("BMW", carEvm.find(carEntityManager, CarView.class, car.getId()).getName());
-        assertEquals("Shared", carEvm.find(carEntityManager, SharedEntityView.class, shared.getId()).getName());
-        assertThatThrownBy(() -> carEvm.find(carEntityManager, Desk.class, desk.getId()));
-    }
-
-    @Test
-    @Transactional
-    public void testDesk() {
-        SharedEntity shared = new SharedEntity("Shared");
-        Car car = new Car("BMW");
-        Desk desk = new Desk("Wooden desk");
-
-        // test EntityManager
-        assertThatThrownBy(() -> deskEntityManager.persist(car)).hasMessageContaining("Unknown entity");
-        deskEntityManager.persist(desk);
-        deskEntityManager.persist(shared);
-
-        // test CriteriaBuilderFactory
-        assertNotNull(deskCbf.create(deskEntityManager, Desk.class).where("id").eq(desk.getId()).getSingleResult());
-        assertNotNull(deskCbf.create(deskEntityManager, SharedEntity.class).where("id").eq(shared.getId()).getSingleResult());
-        assertThatThrownBy(() -> deskCbf.create(deskEntityManager, Car.class).where("id").eq(car.getId()).getSingleResult());
-
-        // test EntityViewManager
-        assertEquals("Wooden desk", deskEvm.find(deskEntityManager, DeskView.class, desk.getId()).getName());
-        assertEquals("Shared", deskEvm.find(deskEntityManager, SharedEntityView.class, shared.getId()).getName());
-        assertThatThrownBy(() -> deskEvm.find(deskEntityManager, Car.class, car.getId()));
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Car.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Car.java
deleted file mode 100644
index 5bba83c8a7..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Car.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@Entity
-public class Car {
-    private Long id;
-    private String name;
-
-    public Car() {
-    }
-
-    public Car(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "carSeq")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Desk.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Desk.java
deleted file mode 100644
index 217160d226..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/Desk.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@Entity
-public class Desk {
-    private Long id;
-    private String name;
-
-    public Desk() {
-    }
-
-    public Desk(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "deskSeq")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/SharedEntity.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/SharedEntity.java
deleted file mode 100644
index 723e125097..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/entity/SharedEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@Entity
-public class SharedEntity {
-    private Long id;
-    private String name;
-
-    public SharedEntity() {
-    }
-
-    public SharedEntity(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sharedEntitySeq")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/CarView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/CarView.java
deleted file mode 100644
index 497d3a9b22..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/CarView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.car;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Car;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(Car.class)
-public interface CarView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/package-info.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/package-info.java
deleted file mode 100644
index 59a64bd0d3..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/car/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@BlazePersistenceInstance("CarBPInstance")
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.car;
-
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/DeskView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/DeskView.java
deleted file mode 100644
index c554915a25..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/DeskView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.desk;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Desk;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(Desk.class)
-public interface DeskView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/package-info.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/package-info.java
deleted file mode 100644
index 1e3f380ffc..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/desk/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@BlazePersistenceInstance("DeskBPInstance")
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.desk;
-
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/SharedEntityView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/SharedEntityView.java
deleted file mode 100644
index bca4d2fefa..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/SharedEntityView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.shared;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(SharedEntity.class)
-public interface SharedEntityView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/package-info.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/package-info.java
deleted file mode 100644
index 94ae2ad5b7..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/annotation/shared/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@BlazePersistenceInstance(BlazePersistenceInstance.DEFAULT)
-@BlazePersistenceInstance("CarBPInstance")
-@BlazePersistenceInstance("DeskBPInstance")
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.annotation.shared;
-
-import com.blazebit.persistence.integration.quarkus.runtime.BlazePersistenceInstance;
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/car/CarView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/car/CarView.java
deleted file mode 100644
index 5c537e72e7..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/car/CarView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.car;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Car;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(Car.class)
-public interface CarView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/desk/DeskView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/desk/DeskView.java
deleted file mode 100644
index c6da2a2345..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/desk/DeskView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.desk;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Desk;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(Desk.class)
-public interface DeskView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/shared/SharedEntityView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/shared/SharedEntityView.java
deleted file mode 100644
index 5f7e58923e..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/multipleinstances/view/config/shared/SharedEntityView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.shared;
-
-import com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@EntityView(SharedEntity.class)
-public interface SharedEntityView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/DocumentResource.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/DocumentResource.java
deleted file mode 100644
index 27a42ad17d..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/DocumentResource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.resource;
-
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentCreateView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.DocumentView;
-import com.blazebit.persistence.view.EntityViewManager;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Path("documents")
-public class DocumentResource {
-
-    @Inject
-    EntityManager entityManager;
-
-    @Inject
-    EntityViewManager entityViewManager;
-
-    @POST
-    @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public DocumentView add(DocumentCreateView view) {
-        entityViewManager.save(entityManager, view);
-        return entityViewManager.find(entityManager, DocumentView.class, view.getId());
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/PersonResource.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/PersonResource.java
deleted file mode 100644
index f52cc9f529..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/resource/PersonResource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.resource;
-
-import com.blazebit.persistence.integration.quarkus.deployment.view.PersonCreateView;
-import com.blazebit.persistence.integration.quarkus.deployment.view.PersonView;
-import com.blazebit.persistence.view.EntityViewManager;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Path("persons")
-public class PersonResource {
-
-    @Inject
-    EntityManager entityManager;
-
-    @Inject
-    EntityViewManager entityViewManager;
-
-    @POST
-    @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public PersonView add(PersonCreateView view) {
-        entityViewManager.save(entityManager, view);
-        return entityViewManager.find(entityManager, PersonView.class, view.getId());
-    }
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentCreateView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentCreateView.java
deleted file mode 100644
index 89a01923fc..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentCreateView.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.view;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Document;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Document.class)
-@CreatableEntityView
-public interface DocumentCreateView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-
-    void setName(String name);
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentView.java
deleted file mode 100644
index a6d613c6ec..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/DocumentView.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.deployment.view;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Document;
-import com.blazebit.persistence.view.EntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Document.class)
-public interface DocumentView extends DocumentCreateView {
-    void setId(Long id);
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonCreateView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonCreateView.java
deleted file mode 100644
index 2be3b5c1bb..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonCreateView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.view;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Person;
-import com.blazebit.persistence.view.CreatableEntityView;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-import java.util.UUID;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Person.class)
-@CreatableEntityView
-public interface PersonCreateView {
-    @IdMapping
-    UUID getId();
-
-    String getName();
-
-    void setName(String name);
-}
diff --git a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonView.java b/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonView.java
deleted file mode 100644
index 32398cb8a1..0000000000
--- a/integration/quarkus/deployment/src/test/java/com/blazebit/persistence/integration/quarkus/deployment/view/PersonView.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.deployment.view;
-
-import com.blazebit.persistence.integration.quarkus.deployment.entity.Person;
-import com.blazebit.persistence.view.EntityView;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@EntityView(Person.class)
-public interface PersonView extends PersonCreateView {
-}
diff --git a/integration/quarkus/deployment/src/test/resources/META-INF/persistence-multiple-persistence-units.xml b/integration/quarkus/deployment/src/test/resources/META-INF/persistence-multiple-persistence-units.xml
deleted file mode 100644
index db025cec42..0000000000
--- a/integration/quarkus/deployment/src/test/resources/META-INF/persistence-multiple-persistence-units.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    <persistence-unit name="CarPU" transaction-type="JTA">
-        <class>com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Car</class>
-        <class>com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="user"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.sharedCache.mode" value="NONE"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-        </properties>
-    </persistence-unit>
-    <persistence-unit name="DeskPU" transaction-type="JTA">
-        <class>com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.Desk</class>
-        <class>com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.entity.SharedEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="user"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.sharedCache.mode" value="NONE"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/integration/quarkus/deployment/src/test/resources/META-INF/persistence.xml b/integration/quarkus/deployment/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index f8514982c3..0000000000
--- a/integration/quarkus/deployment/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    <persistence-unit name="TestsuiteBase" transaction-type="JTA">
-        <class>com.blazebit.persistence.integration.quarkus.deployment.entity.Document</class>
-        <class>com.blazebit.persistence.integration.quarkus.deployment.entity.Person</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="user"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.sharedCache.mode" value="NONE"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/integration/quarkus/deployment/src/test/resources/application-multiple-instances-annotations.properties b/integration/quarkus/deployment/src/test/resources/application-multiple-instances-annotations.properties
deleted file mode 100644
index 1f18d30ba6..0000000000
--- a/integration/quarkus/deployment/src/test/resources/application-multiple-instances-annotations.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:test
-
-quarkus.blaze-persistence."CarBPInstance".persistence-unit=CarPU
-quarkus.blaze-persistence."DeskBPInstance".persistence-unit=DeskPU
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/test/resources/application-multiple-instances.properties b/integration/quarkus/deployment/src/test/resources/application-multiple-instances.properties
deleted file mode 100644
index 31cfec296a..0000000000
--- a/integration/quarkus/deployment/src/test/resources/application-multiple-instances.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:test
-
-quarkus.blaze-persistence."CarBPInstance".persistence-unit=CarPU
-quarkus.blaze-persistence."CarBPInstance".packages=\
-  com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.car,\
-  com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.shared
-quarkus.blaze-persistence."DeskBPInstance".persistence-unit=DeskPU
-quarkus.blaze-persistence."DeskBPInstance".packages=\
-  com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.desk,\
-  com.blazebit.persistence.integration.quarkus.deployment.multipleinstances.view.config.shared
\ No newline at end of file
diff --git a/integration/quarkus/deployment/src/test/resources/application.properties b/integration/quarkus/deployment/src/test/resources/application.properties
deleted file mode 100644
index f68be5cae7..0000000000
--- a/integration/quarkus/deployment/src/test/resources/application.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:test
-
-quarkus.blaze-persistence.persistence-unit=TestsuiteBase
\ No newline at end of file
diff --git a/integration/quarkus/pom.xml b/integration/quarkus/pom.xml
deleted file mode 100644
index 6f568a6e2e..0000000000
--- a/integration/quarkus/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-quarkus-parent</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>runtime</module>
-        <module>deployment</module>
-    </modules>
-
-    <properties>
-        <main.java.version>1.8</main.java.version>
-
-        <version.jandex>2.1.3.Final</version.jandex>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bom</artifactId>
-                <version>${version.quarkus}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
\ No newline at end of file
diff --git a/integration/quarkus/runtime/pom.xml b/integration/quarkus/runtime/pom.xml
deleted file mode 100644
index afd81b91f8..0000000000
--- a/integration/quarkus/runtime/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-quarkus-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>blaze-persistence-integration-quarkus</artifactId>
-
-    <description>Advanced SQL support for JPA and Entity-Views as efficient DTOs</description>
-
-    <properties>
-        <version.graal-sdk>19.3.1</version.graal-sdk>
-        <module.name>com.blazebit.persistence.integration.quarkus</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-            <version>${version.graal-sdk}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${version.javassist}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-extension-processor</artifactId>
-                        <version>${version.quarkus}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>process-config-roots</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>compile</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceConfiguration.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceConfiguration.java
deleted file mode 100644
index 0f25d69d49..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceConfiguration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-import java.util.Map;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ConfigRoot
-public class BlazePersistenceConfiguration {
-
-    /**
-     * Configuration for the default Blaze-Persistence instance.
-     */
-    @ConfigItem(name = ConfigItem.PARENT)
-    public BlazePersistenceInstanceConfiguration defaultBlazePersistence;
-
-    /**
-     * Additional named Blaze-Persistence instances.
-     */
-    @ConfigDocSection
-    @ConfigDocMapKey("blaze-persistence-instance-name")
-    @ConfigItem(name = ConfigItem.PARENT)
-    public Map<String, BlazePersistenceInstanceConfiguration> blazePersistenceInstances;
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceHibernateOrmIntegrationStaticInitListener.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceHibernateOrmIntegrationStaticInitListener.java
deleted file mode 100644
index 7a819c0d1b..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceHibernateOrmIntegrationStaticInitListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.spi.BootstrapContext;
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.engine.config.spi.ConfigurationService;
-
-import java.util.function.BiConsumer;
-
-/**
- * @author Christian Beikov
- * @since 1.6.5
- */
-public class BlazePersistenceHibernateOrmIntegrationStaticInitListener implements HibernateOrmIntegrationStaticInitListener {
-    @Override
-    public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
-    }
-
-    @Override
-    public void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext, BiConsumer<String, Object> propertyCollector) {
-        // Carry over the configured bulk-id strategy from Hibernate56MetadataContributor
-        propertyCollector.accept(AvailableSettings.HQL_BULK_ID_STRATEGY, bootstrapContext.getServiceRegistry().getService(ConfigurationService.class).getSettings().get(AvailableSettings.HQL_BULK_ID_STRATEGY));
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstance.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstance.java
deleted file mode 100644
index 0c2189ef7c..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstance.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@Target({ TYPE, FIELD, PARAMETER, PACKAGE })
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-@Repeatable(BlazePersistenceInstance.List.class)
-public @interface BlazePersistenceInstance {
-
-    String DEFAULT = BlazePersistenceInstanceUtil.DEFAULT_BLAZE_PERSISTENCE_NAME;
-
-    String value();
-
-    /**
-     * @author Moritz Becker
-     * @since 1.6.0
-     */
-    class BlazePersistenceInstanceLiteral extends AnnotationLiteral<BlazePersistenceInstance> implements BlazePersistenceInstance {
-
-        private String name;
-
-        public BlazePersistenceInstanceLiteral(String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String value() {
-            return name;
-        }
-    }
-
-    /**
-     * @author Moritz Becker
-     * @since 1.6.0
-     */
-    @Target(PACKAGE)
-    @Retention(RUNTIME)
-    @Documented
-    @interface List {
-
-        BlazePersistenceInstance[] value();
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceConfiguration.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceConfiguration.java
deleted file mode 100644
index 733f6c08dc..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceConfiguration.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.CTEBuilder;
-import com.blazebit.persistence.ConfigurationProperties;
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.view.EmptyFlatViewCreation;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-@ConfigGroup
-public class BlazePersistenceInstanceConfiguration {
-
-    /**
-     * The name of the persistence unit which this instance of Blaze-Persistence uses.
-     * <p>
-     * If undefined, it will use the default persistence unit.
-     */
-    public Optional<String> persistenceUnit;
-
-    /**
-     * The packages in which the entity views and entity view listeners assigned to this Blaze-Persistence instance are located.
-     */
-    public Optional<Set<String>> packages;
-
-    /**
-     * A boolean flag to make it possible to prepare all view template caches on startup.
-     * By default the eager loading of the view templates is disabled to have a better startup performance.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(defaultValue = "false")
-    public boolean templateEagerLoading;
-
-    /**
-     * A boolean flag to make it possible to disable the managed type validation.
-     * By default the managed type validation is enabled, but since the validation is not bullet proof, it can be disabled.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(defaultValue = "false")
-    public boolean managedTypeValidationDisabled;
-
-    /**
-     * An integer value that defines the default batch size for entity view attributes.
-     * By default the value is 1 and can be overridden either via {@linkplain com.blazebit.persistence.view.BatchFetch#size()}
-     * or by setting this property via {@linkplain com.blazebit.persistence.view.EntityViewSetting#setProperty}.
-     */
-    @ConfigItem(defaultValue = "1")
-    public int defaultBatchSize;
-
-    /**
-     * A mode specifying if correlation value, view root or embedded view batching is expected.
-     * By default the value is <code>values</code> and can be overridden by setting this property via {@linkplain com.blazebit.persistence.view.EntityViewSetting#setProperty}.
-     * Valid values are
-     * <ul>
-     *  <li><code>values</code></li>
-     *  <li><code>view_roots</code></li>
-     *  <li><code>embedding_views</code></li>
-     * </ul>
-     */
-    @ConfigItem(defaultValue = "values")
-    public String expectBatchMode;
-
-    /**
-     * A boolean flag to make it possible to prepare the entity view updater cache on startup.
-     * By default the eager loading of entity view updates is disabled to have a better startup performance.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(name = "updater.eager-loading", defaultValue = "false")
-    public boolean updaterEagerLoading;
-
-    /**
-     * A boolean flag to make it possible to disable the strict validation that disallows the use of an updatable entity view type for owned relationships.
-     * By default the use is disallowed i.e. the default value is <code>true</code>, but since there might be strange models out there, it possible to allow this.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(name = "updater.disallow-owned-updatable-subview", defaultValue = "true")
-    public boolean updaterDisallowOwnedUpdatableSubview;
-
-    /**
-     * A boolean flag to make it possible to disable the strict cascading check that disallows setting updatable or creatable entity views on non-cascading attributes
-     * before being associated with a cascading attribute. When disabled, it is possible, like in JPA, that the changes done to an updatable entity view are not flushed
-     * when it is not associated with an attribute that cascades updates.
-     * By default the use is enabled i.e. the default value is <code>true</code>.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(name = "updater.strict-cascading-check", defaultValue = "true")
-    public boolean updaterStrictCascadingCheck;
-
-    /**
-     * A boolean flag that allows to switch from warnings to boot time validation errors when invalid plural attribute setters are encountered while the strict cascading check is enabled.
-     * When <code>true</code>, a boot time validation error is thrown when encountering an invalid setter, otherwise just a warning.
-     * This configuration has no effect when the strict cascading check is disabled.
-     * By default the use is disabled i.e. the default value is <code>false</code>.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(name = "updater.error-on-invalid-plural-setter", defaultValue = "false")
-    public boolean updaterErrorOnInvalidPluralSetter;
-
-    /**
-     * A boolean flag that allows to specify if empty flat views should be created by default if not specified via {@link EmptyFlatViewCreation}.
-     * By default the creation of empty flat views is enabled i.e. the default value is <code>true</code>.
-     * Valid values for this property are <code>true</code> or <code>false</code>.
-     */
-    @ConfigItem(defaultValue = "true")
-    public boolean createEmptyFlatViews;
-
-    /**
-     * The fully qualified expression cache implementation class name.
-     */
-    @ConfigItem(defaultValue = "com.blazebit.persistence.parser.expression.ConcurrentHashMapExpressionCache")
-    public String expressionCacheClass;
-
-    /**
-     * If set to true, the CTE queries are inlined by default.
-     * Valid values for this property are <code>true</code>, <code>false</code> or <code>auto</code>.
-     * Default is <code>true</code> which will always inline non-recursive CTEs.
-     * The <code>auto</code> configuration will only make use of inlining if the JPA provider and DBMS dialect support/require it.
-     *
-     * The property can be changed for a criteria builder before constructing a query.
-     *
-     * @see CTEBuilder#with(Class, boolean)
-     * @see CTEBuilder#with(Class, CriteriaBuilder, boolean)
-     */
-    @ConfigItem(defaultValue = "true")
-    public boolean inlineCtes;
-
-    /**
-     * If set to true, the query plans are cached and reused.
-     * Valid values for this property are <code>true</code> and <code>false</code>.
-     * Default is <code>true</code>.
-     * This configuration option currently only takes effect when Hibernate is used as JPA provider.
-     *
-     * The property can be changed for a criteria builder before constructing a query.
-     */
-    @ConfigItem(defaultValue = "true")
-    public boolean queryPlanCacheEnabled;
-
-    public void apply(CriteriaBuilderConfiguration criteriaBuilderConfiguration) {
-        criteriaBuilderConfiguration.setProperty(ConfigurationProperties.EXPRESSION_CACHE_CLASS, expressionCacheClass);
-        criteriaBuilderConfiguration.setProperty(ConfigurationProperties.INLINE_CTES, Boolean.toString(inlineCtes));
-        criteriaBuilderConfiguration.setProperty(ConfigurationProperties.QUERY_PLAN_CACHE_ENABLED, Boolean.toString(queryPlanCacheEnabled));
-    }
-
-    public void apply(EntityViewConfiguration entityViewConfiguration) {
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.TEMPLATE_EAGER_LOADING, Boolean.toString(templateEagerLoading));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.MANAGED_TYPE_VALIDATION_DISABLED, Boolean.toString(managedTypeValidationDisabled));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.DEFAULT_BATCH_SIZE, Integer.toString(defaultBatchSize));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.EXPECT_BATCH_MODE, expectBatchMode);
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.UPDATER_EAGER_LOADING, Boolean.toString(updaterEagerLoading));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.UPDATER_DISALLOW_OWNED_UPDATABLE_SUBVIEW, Boolean.toString(updaterDisallowOwnedUpdatableSubview));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.UPDATER_STRICT_CASCADING_CHECK, Boolean.toString(updaterStrictCascadingCheck));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.UPDATER_ERROR_ON_INVALID_PLURAL_SETTER, Boolean.toString(updaterErrorOnInvalidPluralSetter));
-        entityViewConfiguration.setProperty(com.blazebit.persistence.view.ConfigurationProperties.CREATE_EMPTY_FLAT_VIEWS, Boolean.toString(createEmptyFlatViews));
-    }
-
-    public boolean isAnyPropertySet() {
-        return !createEmptyFlatViews ||
-                defaultBatchSize != 1 ||
-                !"values".equals(expectBatchMode) ||
-                !"com.blazebit.persistence.parser.expression.ConcurrentHashMapExpressionCache".equals(expressionCacheClass) ||
-                !queryPlanCacheEnabled ||
-                !inlineCtes ||
-                persistenceUnit.isPresent() ||
-                packages.isPresent() ||
-                templateEagerLoading ||
-                managedTypeValidationDisabled ||
-                !updaterDisallowOwnedUpdatableSubview ||
-                updaterEagerLoading ||
-                updaterErrorOnInvalidPluralSetter ||
-                !updaterStrictCascadingCheck;
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceUtil.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceUtil.java
deleted file mode 100644
index 8f1d41f1f8..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceInstanceUtil.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-/**
- * @author Moritz Becker
- * @since 1.6.0
- */
-public class BlazePersistenceInstanceUtil {
-
-    public static final String DEFAULT_BLAZE_PERSISTENCE_NAME = "<default>";
-
-    private BlazePersistenceInstanceUtil() {
-    }
-
-    public static boolean isDefaultBlazePersistenceInstance(String blazePersistanceInstanceName) {
-        return DEFAULT_BLAZE_PERSISTENCE_NAME.equals(blazePersistanceInstanceName);
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceSubstitutions.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceSubstitutions.java
deleted file mode 100644
index fa2f531677..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/BlazePersistenceSubstitutions.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import javassist.CannotCompileException;
-import javassist.CtClass;
-
-import java.io.IOException;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@TargetClass(className = "com.blazebit.persistence.view.impl.proxy.ProxyFactory")
-final class ProxyFactory {
-
-    @Substitute
-    private <T> Class<? extends T> defineOrGetClass(EntityViewManager entityViewManager, boolean unsafe, Class<?> clazz, Class<?> neighbourClazz, CtClass cc) throws IOException, IllegalAccessException, NoSuchFieldException, CannotCompileException {
-        throw new RuntimeException("Unsupported in the native compiler.");
-    }
-
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/CriteriaBuilderConfigurationHolder.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/CriteriaBuilderConfigurationHolder.java
deleted file mode 100644
index bc7f1393f8..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/CriteriaBuilderConfigurationHolder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ApplicationScoped
-public class CriteriaBuilderConfigurationHolder {
-
-    private volatile CriteriaBuilderConfiguration criteriaBuilderConfiguration;
-
-    @Produces
-    public CriteriaBuilderConfiguration getCriteriaBuilderConfiguration() {
-        return criteriaBuilderConfiguration;
-    }
-
-    public void setCriteriaBuilderConfiguration(CriteriaBuilderConfiguration criteriaBuilderConfiguration) {
-        this.criteriaBuilderConfiguration = criteriaBuilderConfiguration;
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultCriteriaBuilderFactoryProducer.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultCriteriaBuilderFactoryProducer.java
deleted file mode 100644
index 305427abb7..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultCriteriaBuilderFactoryProducer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import io.quarkus.arc.DefaultBean;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Dependent
-public class DefaultCriteriaBuilderFactoryProducer {
-
-    @DefaultBean
-    @Produces
-    @ApplicationScoped
-    public CriteriaBuilderFactory produceCriteriaBuilderFactory(Instance<EntityManagerFactory> entityManagerFactory,
-                                                                CriteriaBuilderConfiguration criteriaBuilderConfiguration) {
-        return criteriaBuilderConfiguration.createCriteriaBuilderFactory(entityManagerFactory.get());
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultEntityViewManagerProducer.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultEntityViewManagerProducer.java
deleted file mode 100644
index 77c4b47bfb..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/DefaultEntityViewManagerProducer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import io.quarkus.arc.DefaultBean;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Dependent
-public class DefaultEntityViewManagerProducer {
-
-    @DefaultBean
-    @Produces
-    @ApplicationScoped
-    public EntityViewManager produceEntityViewManager(CriteriaBuilderFactory cbf, EntityViewConfiguration entityViewConfiguration) {
-        return entityViewConfiguration.createEntityViewManager(cbf);
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewConfigurationHolder.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewConfigurationHolder.java
deleted file mode 100644
index 596d73df21..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewConfigurationHolder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@ApplicationScoped
-public class EntityViewConfigurationHolder {
-
-    private volatile EntityViewConfiguration entityViewConfiguration;
-
-    @Produces
-    public EntityViewConfiguration getEntityViewConfiguration() {
-        return entityViewConfiguration;
-    }
-
-    public void setEntityViewConfiguration(EntityViewConfiguration entityViewConfiguration) {
-        this.entityViewConfiguration = entityViewConfiguration;
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewRecorder.java b/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewRecorder.java
deleted file mode 100644
index a3ba22615d..0000000000
--- a/integration/quarkus/runtime/src/main/java/com/blazebit/persistence/integration/quarkus/runtime/EntityViewRecorder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.integration.quarkus.runtime;
-
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.view.ConfigurationProperties;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViews;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import io.quarkus.arc.Arc;
-import io.quarkus.hibernate.orm.runtime.JPAConfig;
-import io.quarkus.runtime.annotations.Recorder;
-
-import javax.enterprise.inject.Default;
-import javax.persistence.EntityManagerFactory;
-import java.lang.annotation.Annotation;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-@Recorder
-public class EntityViewRecorder {
-
-    public Supplier<CriteriaBuilderFactory> criteriaBuilderFactorySupplier(BlazePersistenceInstanceConfiguration blazePersistenceConfig, String blazePersistenceInstanceName, String persistenceUnitName) {
-        return () -> {
-            CriteriaBuilderConfiguration criteriaBuilderConfiguration = Criteria.getDefault();
-            blazePersistenceConfig.apply(criteriaBuilderConfiguration);
-            Annotation[] cbfQualifiers;
-            if (BlazePersistenceInstanceUtil.isDefaultBlazePersistenceInstance(blazePersistenceInstanceName)) {
-                cbfQualifiers = new Annotation[] { new Default.Literal() };
-            } else {
-                cbfQualifiers = new Annotation[] { new BlazePersistenceInstance.BlazePersistenceInstanceLiteral(blazePersistenceInstanceName) };
-            }
-
-            Arc.container().beanManager().fireEvent(criteriaBuilderConfiguration, cbfQualifiers);
-            EntityManagerFactory emf = Arc.container().instance(JPAConfig.class, new Annotation[0]).get().getEntityManagerFactory(persistenceUnitName);
-            return criteriaBuilderConfiguration.createCriteriaBuilderFactory(emf);
-        };
-    }
-
-    public Supplier<EntityViewManager> entityViewManagerSupplier(BlazePersistenceInstanceConfiguration blazePersistenceConfig,
-                                                                 String blazePersistenceInstanceName,
-                                                                 Set<String> entityViewClasses,
-                                                                 Set<String> entityViewListenerClasses) {
-        return () -> {
-            EntityViewConfiguration entityViewConfiguration = EntityViews.createDefaultConfiguration();
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            for (String entityViewClass : entityViewClasses) {
-                try {
-                    entityViewConfiguration.addEntityView(
-                        classLoader.loadClass(entityViewClass)
-                    );
-                } catch (ClassNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            for (String entityViewListenerClass : entityViewListenerClasses) {
-                try {
-                    entityViewConfiguration.addEntityViewListener(
-                            classLoader.loadClass(entityViewListenerClass)
-                    );
-                } catch (ClassNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            blazePersistenceConfig.apply(entityViewConfiguration);
-            entityViewConfiguration.setProperty(ConfigurationProperties.PROXY_UNSAFE_ALLOWED, Boolean.FALSE.toString());
-
-            Annotation[] cbfQualifiers;
-            if (BlazePersistenceInstanceUtil.isDefaultBlazePersistenceInstance(blazePersistenceInstanceName)) {
-                cbfQualifiers = new Annotation[] { new Default.Literal() };
-            } else {
-                cbfQualifiers = new Annotation[] { new BlazePersistenceInstance.BlazePersistenceInstanceLiteral(blazePersistenceInstanceName) };
-            }
-
-            Arc.container().beanManager().fireEvent(entityViewConfiguration, cbfQualifiers);
-            CriteriaBuilderFactory cbf = Arc.container().instance(CriteriaBuilderFactory.class, cbfQualifiers).get();
-            return entityViewConfiguration.createEntityViewManager(cbf);
-        };
-    }
-}
diff --git a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties b/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties
deleted file mode 100644
index b2388826d4..0000000000
--- a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-provides-capabilities=com.blazebit.persistence.integration.quarkus
-deployment-artifact=${project.groupId}\:blaze-persistence-integration-quarkus-deployment\:${project.version}
diff --git a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.yaml
deleted file mode 100644
index 6e7943e38e..0000000000
--- a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: "Blaze-Persistence"
-metadata:
-  short-name: "BP"
-  keywords:
-  - "jpa"
-  - "hibernate"
-  - "blaze-persistence"
-  - "entity-view"
-  - "dto"
-  - "mapper"
-  - "sql"
-  guide: "https://quarkus.io/guides/blaze-persistence"
-  categories:
-  - "data"
-  status: "stable"
-  built-with-quarkus-core: "1.11.7.Final"
-  capabilities:
-    provides:
-    - "com.blazebit.persistence.integration.quarkus"
-  extension-dependencies:
-  - "io.quarkus:quarkus-core"
-  - "io.quarkus:quarkus-hibernate-orm"
-  - "io.quarkus:quarkus-agroal"
-  - "io.quarkus:quarkus-arc"
-  - "io.quarkus:quarkus-datasource"
-  - "io.quarkus:quarkus-narayana-jta"
-  - "io.quarkus:quarkus-mutiny"
-  - "io.quarkus:quarkus-smallrye-context-propagation"
-  - "io.quarkus:quarkus-caffeine"
-artifact: "${project.groupId}:${project.artifactId}::jar:${project.version}"
-group-id: "${project.groupId}"
-artifact-id: "${project.artifactId}"
-description: "Advanced SQL support for JPA and Entity-Views as efficient DTOs"
diff --git a/integration/querydsl/expressions-jakarta/pom.xml b/integration/querydsl/expressions-jakarta/pom.xml
deleted file mode 100644
index e41a50cfd9..0000000000
--- a/integration/querydsl/expressions-jakarta/pom.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-querydsl-expressions-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.querydsl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-querydsl-expressions</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.querydsl</groupId>
-            <artifactId>querydsl-jpa</artifactId>
-            <version>${querydsl.version}</version>
-            <classifier>jakarta</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-querydsl-expressions:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-querydsl-expressions:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-querydsl-expressions:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/querydsl/expressions/pom.xml b/integration/querydsl/expressions/pom.xml
index a576012ca9..756e1c964b 100644
--- a/integration/querydsl/expressions/pom.xml
+++ b/integration/querydsl/expressions/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
@@ -13,10 +13,51 @@
     <artifactId>blaze-persistence-integration-querydsl-expressions</artifactId>
     <name>Blazebit Persistence Integration QueryDSL Expressions</name>
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
             <version>${querydsl.version}</version>
+            <classifier>jakarta</classifier>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -37,12 +78,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
@@ -55,6 +90,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
+                    <source>8</source> <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
                     <dependencySourceIncludes>com.querydsl:*</dependencySourceIncludes>
                     <isOffline>true</isOffline>
                     <offlineLinks>
@@ -96,60 +132,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>jdk9+</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <source>8</source> <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-                            <dependencySourceIncludes>com.querydsl:*</dependencySourceIncludes>
-                            <isOffline>true</isOffline>
-                            <offlineLinks>
-                                <offlineLink>
-                                    <url>https://javadoc.io/doc/com.querydsl/querydsl-jpa/${querydsl.version}/</url>
-                                    <location>../../../javadoc/querydsl-jpa-${querydsl.version}/</location>
-                                </offlineLink>
-                                <offlineLink>
-                                    <url>https://javadoc.io/doc/com.querydsl/querydsl-sql/${querydsl.version}/</url>
-                                    <location>../../../javadoc/querydsl-sql-${querydsl.version}/</location>
-                                </offlineLink>
-                                <offlineLink>
-                                    <url>https://javadoc.io/doc/com.querydsl/querydsl-core/${querydsl.version}/</url>
-                                    <location>../../../javadoc/querydsl-core-${querydsl.version}/</location>
-                                </offlineLink>
-                            </offlineLinks>
-                            <tags>
-                                <tag>
-                                    <name>apiNote</name>
-                                    <placement>a</placement>
-                                    <head>API Note:</head>
-                                </tag>
-                            </tags>
-                            <additionalDependencies>
-                                <additionalDependency>
-                                    <groupId>com.querydsl</groupId>
-                                    <artifactId>querydsl-sql</artifactId>
-                                    <version>${querydsl.version}</version>
-                                </additionalDependency>
-                            </additionalDependencies>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.google.code.findbugs</groupId>
-                                <artifactId>jsr305</artifactId>
-                                <version>3.0.2</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/AbstractBlazeJPAQuery.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/AbstractBlazeJPAQuery.java
index ed71fda333..b3a0bd65b2 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/AbstractBlazeJPAQuery.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/AbstractBlazeJPAQuery.java
@@ -32,10 +32,10 @@
 import com.querydsl.jpa.JPQLTemplates;
 import com.querydsl.jpa.impl.AbstractJPAQuery;
 
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.annotation.Nullable;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -311,9 +311,9 @@ public T fetchOne() throws NonUniqueResultException {
         try {
             Query query = createQuery(getMetadata().getModifiers(), false);
             return (T) getSingleResult(query);
-        } catch (javax.persistence.NoResultException e) {
+        } catch (jakarta.persistence.NoResultException e) {
             return null;
-        } catch (javax.persistence.NonUniqueResultException e) {
+        } catch (jakarta.persistence.NonUniqueResultException e) {
             throw new NonUniqueResultException(e);
         } finally {
             reset();
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/Binds.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/Binds.java
index abb4f8c453..7e188f69a2 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/Binds.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/Binds.java
@@ -11,7 +11,7 @@
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.Visitor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeCriteriaBuilderRenderer.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeCriteriaBuilderRenderer.java
index 29064f172a..6806911727 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeCriteriaBuilderRenderer.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeCriteriaBuilderRenderer.java
@@ -74,7 +74,7 @@
 import com.querydsl.jpa.JPAQueryMixin;
 import com.querydsl.jpa.JPQLTemplates;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQuery.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQuery.java
index dd91857837..edf5a3e0c3 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQuery.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQuery.java
@@ -11,7 +11,7 @@
 import com.querydsl.core.types.Expression;
 import com.querydsl.jpa.JPQLTemplates;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * BlazeJPAQuery is the default implementation of the JPQLQuery interface for Blaze-Persistence JPQL.Next
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQueryFactory.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQueryFactory.java
index e6285d4268..5bdfff26c5 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQueryFactory.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/BlazeJPAQueryFactory.java
@@ -19,7 +19,7 @@
 import com.querydsl.jpa.impl.JPAInsertClause;
 import com.querydsl.jpa.impl.JPAUpdateClause;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/JPQLNextSerializer.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/JPQLNextSerializer.java
index cd30f6c816..3f27644de6 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/JPQLNextSerializer.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/JPQLNextSerializer.java
@@ -15,8 +15,8 @@
 import com.querydsl.jpa.JPQLSerializer;
 import com.querydsl.jpa.JPQLTemplates;
 
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
+import jakarta.annotation.Nullable;
+import jakarta.persistence.EntityManager;
 import java.lang.reflect.Field;
 import java.util.List;
 
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpression.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpression.java
index 35f7aef6ee..3d0c3e1b95 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpression.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpression.java
@@ -9,8 +9,6 @@
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.SubQueryExpression;
 
-import javax.annotation.Nonnegative;
-
 /**
  * Set expresion defines an interface for set operation queries.
  * Analog to {@link com.querydsl.sql.Union}, but also used for {@code INTERSECT} and {@code EXCEPT} operations.
@@ -27,7 +25,7 @@ public interface SetExpression<RT> extends SubQueryExpression<RT>, Fetchable<RT>
      * @param limit max rows
      * @return the current object
      */
-    SetExpression<RT> limit(@Nonnegative long limit);
+    SetExpression<RT> limit(long limit);
 
     /**
      * Set the offset for the query results
@@ -35,7 +33,7 @@ public interface SetExpression<RT> extends SubQueryExpression<RT>, Fetchable<RT>
      * @param offset row offset
      * @return the current object
      */
-    SetExpression<RT> offset(@Nonnegative long offset);
+    SetExpression<RT> offset(long offset);
 
     /**
      * Define the ordering of the query results
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpressionImpl.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpressionImpl.java
index a23ebc8c3b..172b6133c6 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpressionImpl.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/SetExpressionImpl.java
@@ -14,7 +14,7 @@
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Visitor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 /**
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/ValuesExpression.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/ValuesExpression.java
index ea50f757fe..59c70ad0ad 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/ValuesExpression.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/ValuesExpression.java
@@ -9,7 +9,7 @@
 import com.querydsl.core.types.PathMetadata;
 import com.querydsl.core.types.Visitor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Collection;
 
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowDefinition.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowDefinition.java
index fbcf11e9cb..6a8c5e5e17 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowDefinition.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowDefinition.java
@@ -17,7 +17,7 @@
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.SimpleExpression;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowFunction.java b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowFunction.java
index 57da2998bc..41cd7dce83 100644
--- a/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowFunction.java
+++ b/integration/querydsl/expressions/src/main/java/com/blazebit/persistence/querydsl/WindowFunction.java
@@ -12,7 +12,7 @@
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.SimpleExpression;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Objects;
 
 /**
diff --git a/integration/querydsl/pom.xml b/integration/querydsl/pom.xml
index 69dd1fca9e..b33b96c9b9 100644
--- a/integration/querydsl/pom.xml
+++ b/integration/querydsl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
@@ -13,6 +13,5 @@
     <modules>
         <module>expressions</module>
         <module>testsuite</module>
-        <module>expressions-jakarta</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/integration/querydsl/testsuite/pom.xml b/integration/querydsl/testsuite/pom.xml
index 84e2ac43f0..f75f9465b7 100644
--- a/integration/querydsl/testsuite/pom.xml
+++ b/integration/querydsl/testsuite/pom.xml
@@ -3,14 +3,13 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blaze-persistence-integration-querydsl-testsuite</artifactId>
     <name>Blazebit Persistence Integration QueryDSL Testsuite</name>
     <properties>
-        <main.java.version>1.8</main.java.version>
         <module.name>com.blazebit.persistence.querydsl.testsuite</module.name>
     </properties>
     <dependencies>
@@ -61,12 +60,12 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.activation}</version>
+            <version>${version.activation-api}</version>
         </dependency>
 
     </dependencies>
@@ -113,40 +112,6 @@
         </profile>
         <profile>
             <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
             <build>
                 <plugins>
                     <plugin>
@@ -214,40 +179,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>db2</id>
             <build>
@@ -283,40 +214,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>oracle</id>
             <build>
@@ -394,2272 +291,377 @@
 
         <!-- JPA provider profiles -->
         <profile>
-            <id>hibernate</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
+                    <version>${version.hibernate-6.2}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-4.3</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
+                    <version>${version.hibernate-6.4}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.0</id>
+            <id>hibernate-6.6</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>eclipselink</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>eclipselink</artifactId>
+                    <version>${version.eclipselink}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                    <version>${version.eclipselink}</version>
                     <scope>provided</scope>
                 </dependency>
+                <dependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/main/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.2</id>
+            <id>hibernate-apt</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
+                    <version>${version.hibernate-apt}</version>
                     <scope>provided</scope>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
+                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                    <version>${project.version}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
@@ -2687,11 +689,12 @@
                         <groupId>com.querydsl</groupId>
                         <artifactId>querydsl-apt</artifactId>
                         <version>${querydsl.version}</version>
+                        <classifier>jakarta</classifier>
                     </dependency>
                     <dependency>
                         <groupId>jakarta.annotation</groupId>
                         <artifactId>jakarta.annotation-api</artifactId>
-                        <version>${version.annotation}</version>
+                        <version>${version.annotation-api}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java b/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java
index 179c422b6a..76f69f5ea1 100644
--- a/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java
+++ b/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java
@@ -5,6 +5,20 @@
 
 package com.blazebit.persistence.querydsl;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.FinalSetOperationCriteriaBuilder;
 import com.blazebit.persistence.JoinType;
@@ -12,7 +26,9 @@
 import com.blazebit.persistence.Queryable;
 import com.blazebit.persistence.spi.LateralStyle;
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.base.jpa.category.*;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.entity.BookEntity;
 import com.blazebit.persistence.testsuite.entity.Document;
 import com.blazebit.persistence.testsuite.entity.IdHolderCTE;
@@ -40,22 +56,17 @@
 import com.querydsl.jpa.JPQLQuery;
 import com.querydsl.jpa.JPQLTemplates;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
-
-import javax.persistence.EntityManager;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-
-import static com.blazebit.persistence.querydsl.JPQLNextExpressions.*;
+import jakarta.persistence.EntityManager;
+
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.bind;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.castToNum;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.lastValue;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.literal;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.rowNumber;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.select;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.selectFrom;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.selectOne;
+import static com.blazebit.persistence.querydsl.JPQLNextExpressions.sum;
 import static com.blazebit.persistence.querydsl.SetUtils.intersect;
 import static com.blazebit.persistence.querydsl.SetUtils.union;
 import static com.blazebit.persistence.querydsl.SetUtils.unionAll;
@@ -63,7 +74,6 @@
 import static com.blazebit.persistence.testsuite.entity.QIdHolderCTE.idHolderCTE;
 import static com.blazebit.persistence.testsuite.entity.QPerson.person;
 import static com.blazebit.persistence.testsuite.entity.QRecursiveEntity.recursiveEntity;
-import static com.querydsl.core.types.dsl.Expressions.asNumber;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -203,7 +213,7 @@ public void testExplicitJoinFollowedByImplicitJoin3() {
 
     // NOTE: This requires advanced SQL support
     @Test
-    @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testFetchCount() {
         doInJPA(em -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -285,7 +295,7 @@ public void testThroughBlazeJPAQuery() {
 
     @Test
     // NOTE: Querydsl integration needs JPA 2.2 for streaming to work
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class})
+    @Category({ NoEclipselink.class })
     public void testResultStream() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -318,9 +328,7 @@ public void testParameterExpression() {
         });
     }
 
-    // Note: Datanucleus has issues with  parameters in the select clause
     @Test
-    @Category({NoDatanucleus.class})
     public void testParameterExpressionInSelect() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -352,9 +360,7 @@ public void testSubQuery() {
         });
     }
 
-    // NOTE: Window functions were only introduced in MySQL8
     @Test
-    @Category({ NoMySQLOld.class })
     public void testWindowFunction() {
         Assume.assumeTrue(dbmsDialect.supportsWindowFunctions());
 
@@ -372,9 +378,7 @@ public void testWindowFunction() {
         });
     }
 
-    // NOTE: Window functions were only introduced in MySQL8
     @Test
-    @Category({ NoMySQLOld.class })
     public void testNamedWindowFunction() {
         Assume.assumeTrue(dbmsDialect.supportsWindowFunctions());
 
@@ -398,7 +402,6 @@ public void testNamedWindowFunction() {
 
     @Test
     @Ignore("Filter support is work in progress")
-    @Category({ NoMySQLOld.class })
     public void testFilteredWindowfunction() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -422,7 +425,7 @@ public void testFilteredWindowfunction() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testNestedSubQuery() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -467,9 +470,8 @@ public void testAssociationJoin() {
         });
     }
 
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class })
+    @Category({ NoEclipselink.class })
     public void testEntityJoin() {
         Assume.assumeTrue(jpaProvider.supportsEntityJoin());
 
@@ -489,7 +491,7 @@ public void testEntityJoin() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testFromValues() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -509,7 +511,7 @@ public void testFromValues() {
 
     // NOTE: Querydsl integration needs JPA 2.2 for streaming to work
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class})
+    @Category({ NoEclipselink.class })
     public void testFromValuesStream() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -532,7 +534,7 @@ public void testFromValuesStream() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testFromValuesAttributes() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -550,7 +552,7 @@ public void testFromValuesAttributes() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void  testComplexUnion() {
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
@@ -560,16 +562,14 @@ public void  testComplexUnion() {
             entityManager.persist(person);
 
             Document theBook = new Document();
-            theBook.setId(1337L);
             theBook.setName("test");
             theBook.setOwner(person);
-            entityManager.merge(theBook);
+            entityManager.persist(theBook);
 
             Document theSequel = new Document();
-            theSequel.setId(42L);
             theSequel.setName("test2");
             theSequel.setOwner(person);
-            entityManager.merge(theSequel);
+            entityManager.persist(theSequel);
         });
 
         doInJPA(entityManager -> {
@@ -578,7 +578,7 @@ public void  testComplexUnion() {
                         queryFactory.intersect(
                                 select(document).from(document).where(document.id.eq(41L)),
                                 queryFactory.except(
-                                        select(document).from(document).where(document.id.eq(42L)),
+                                        select(document).from(document).where(document.name.eq("test2")),
                                         select(document).from(document).where(document.id.eq(43L)))),
                         select(document).from(document).where(document.id.eq(46L)))
                     .fetch();
@@ -590,7 +590,7 @@ public void  testComplexUnion() {
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     // NOTE: MySQL only supports the UNION set operation
     @Test
-    @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoMySQL.class, NoEclipselink.class })
     public void testComplexSubqueryUnion() {
         doInJPA(entityManager -> {
             Person person = new Person();
@@ -598,27 +598,25 @@ public void testComplexSubqueryUnion() {
             entityManager.persist(person);
 
             Document theBook = new Document();
-            theBook.setId(1337L);
             theBook.setName("test");
             theBook.setOwner(person);
-            entityManager.merge(theBook);
+            entityManager.persist(theBook);
 
             Document theSequel = new Document();
-            theSequel.setId(42L);
             theSequel.setName("test2");
             theSequel.setOwner(person);
-            entityManager.merge(theSequel);
+            entityManager.persist(theSequel);
         });
 
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
 
             SetExpression<Long> union = queryFactory
-                    .union(select(document.id).from(document).where(document.id.eq(1337L)),
+                    .union(select(document.id).from(document).where(document.name.eq("test")),
                             queryFactory.intersect(
                                     select(document.id).from(document).where(document.id.eq(41L)),
                                     queryFactory.except(
-                                            select(document.id).from(document).where(document.id.eq(42L)),
+                                            select(document.id).from(document).where(document.name.eq("test2")),
                                             select(document.id).from(document).where(document.id.eq(43L)))),
                             select(document.id).from(document).where(document.id.eq(46L))
                     );
@@ -636,7 +634,7 @@ public void testComplexSubqueryUnion() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCTE() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -652,7 +650,7 @@ public void testCTE() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCTEClone() {
         doInJPA(entityManager -> {
             BlazeJPAQuery<Long> from = new BlazeJPAQuery<Document>(entityManager, cbf)
@@ -668,7 +666,7 @@ public void testCTEClone() {
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     // NOTE: Querydsl integration needs JPA 2.2 for streaming to work
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class})
+    @Category({ NoEclipselink.class })
     public void testCTEStream() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -685,7 +683,7 @@ public void testCTEStream() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCTEWithBinds() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -701,7 +699,7 @@ public void testCTEWithBinds() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCTEWithBindsWithAlias() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -717,7 +715,7 @@ public void testCTEWithBindsWithAlias() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCTEWithBinds2() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -735,7 +733,7 @@ public void testCTEWithBinds2() {
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     // NOTE: MySQL only supports the UNION set operation
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class })
+    @Category({ NoEclipselink.class, NoMySQL.class })
     public void testCTEUnion() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -751,7 +749,7 @@ public void testCTEUnion() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testCTEFromValues() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -772,9 +770,8 @@ public void testCTEFromValues() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Recursive CTE support was only added in MySQL8
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testRecursiveCTEUnion() {
         Assume.assumeTrue(dbmsDialect.supportsWithClause());
         JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -792,9 +789,8 @@ public void testRecursiveCTEUnion() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Recursive CTE support was only added in MySQL8
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testRecursiveBindBuilder() {
         Assume.assumeTrue(dbmsDialect.supportsWithClause());
 
@@ -815,7 +811,7 @@ public void testRecursiveBindBuilder() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testInlineEntityWithLimit() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -837,7 +833,7 @@ public void testInlineEntityWithLimit() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoEclipselink.class })
     public void testCteInSubquery() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -856,10 +852,8 @@ public void testCteInSubquery() {
         });
     }
 
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // NOTE: Hibernate 5.1 renders t.id = tSub.id rather than t = tSub
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class})
+    @Category({ NoEclipselink.class })
     public void testMultipleInlineEntityWithLimitJoin() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -889,10 +883,9 @@ public void testMultipleInlineEntityWithLimitJoin() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // Oracle, H2 and MySQL <8 do not support lateral joins
+    // H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOracle.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testMultipleInlineEntityWithLimitJoinLateral() {
         Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE);
 
@@ -924,10 +917,9 @@ public void testMultipleInlineEntityWithLimitJoinLateral() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // Oracle, H2 and MySQL <8 do not support lateral joins
+    // H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoH2.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinInlineEntityWithLimit() {
         Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE);
 
@@ -950,10 +942,9 @@ public void testJoinInlineEntityWithLimit() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // Oracle, H2 and MySQL <8 do not support lateral joins
+    // H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class, NoOracle.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinInlineEntityWithLimitWithCTE() {
         Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE);
 
@@ -979,9 +970,8 @@ public void testJoinInlineEntityWithLimitWithCTE() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoMySQL.class })
+    @Category({ NoEclipselink.class })
     public void testJoinInlineWithLimitUnion() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -1018,10 +1008,8 @@ public void testJoinInlineWithLimitUnion() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // NOTE: MySQL (also MySQL 8) doesn't yet support 'nesting of unions at the right-hand side'
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoMySQL.class })
+    @Category({ NoEclipselink.class })
     public void testJoinInlineEntityWithLimitUnion() {
         doInJPA(entityManager -> {
             JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf);
@@ -1048,10 +1036,9 @@ public void testJoinInlineEntityWithLimitUnion() {
     }
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
-    // NOTE: Entity joins are only supported on Hibernate 5.1+
-    // Oracle, H2 and MySQL <8 do not support lateral joins
+    // H2 does not support lateral joins
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class, NoH2.class })
     public void testJoinInlineLateralEntityWithLimitUnion() {
         Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE);
 
@@ -1085,7 +1072,7 @@ public void testJoinInlineLateralEntityWithLimitUnion() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testMultipleFromEntitySubqueries() {
         doInJPA(em -> {
             String expected = cbf.create(em, Person.class)
@@ -1117,7 +1104,7 @@ public void testMultipleFromEntitySubqueries() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testCteInLeftNestedSet() {
         doInJPA(em -> {
             FinalSetOperationCriteriaBuilder<Tuple> cb = cbf.startSet(em, Tuple.class)
@@ -1163,7 +1150,7 @@ public void testCteInLeftNestedSet() {
 
     // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet
     @Test
-    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class })
+    @Category({ NoEclipselink.class })
     public void testExpressionEqualToSubquery() {
         doInJPA(em -> {
             CriteriaBuilder<Person> select = cbf.create(em, Person.class)
diff --git a/integration/spring-data/1.x/pom.xml b/integration/spring-data/1.x/pom.xml
deleted file mode 100644
index 565db1cdb7..0000000000
--- a/integration/spring-data/1.x/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 1.x</name>
-    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>4.3.3.RELEASE</version.spring>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-1.x}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 72ca5c19fb..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 1.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 068078cc7e..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Iterable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 6a63b9a510..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index 042dac295b..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- * 
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-public class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-    private final CriteriaBuilder builder;
-    private final Iterator<? extends JpaParameters.JpaParameter> parameters;
-    private final List<ParameterMetadata<?>> expressions;
-    private final Iterator<Object> bindableParameterValues;
-    private final PersistenceProvider persistenceProvider;
-
-    /**
-     * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-     * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-     * .
-     *
-     * @param builder must not be {@literal null}.
-     * @param accessor must not be {@literal null}.
-     * @param provider must not be {@literal null}.
-     */
-    public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider) {
-        this(builder, accessor.iterator(), (JpaParameters) accessor.getParameters(), provider);
-    }
-
-    /**
-     * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-     * support for parameter value customizations via {@link PersistenceProvider}.
-     *
-     * @param builder must not be {@literal null}.
-     * @param parameters must not be {@literal null}.
-     * @param provider must not be {@literal null}.
-     */
-    public ParameterMetadataProviderImpl(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider) {
-        this(builder, null, parameters, provider);
-    }
-
-    /**
-     * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-     * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-     * {@link PersistenceProvider}.
-     *
-     * @param builder must not be {@literal null}.
-     * @param bindableParameterValues may be {@literal null}.
-     * @param parameters must not be {@literal null}.
-     * @param provider must not be {@literal null}.
-     */
-    private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          JpaParameters parameters, PersistenceProvider provider) {
-
-        Assert.notNull(builder, "CriteriaBuilder must not be null!");
-        Assert.notNull(parameters, "Parameters must not be null!");
-        Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-        this.builder = builder;
-        this.parameters = parameters.getBindableParameters().iterator();
-        this.expressions = new ArrayList<ParameterMetadata<?>>();
-        this.bindableParameterValues = bindableParameterValues;
-        this.persistenceProvider = provider;
-    }
-
-    /**
-     * Returns all {@link ParameterMetadata}s built.
-     *
-     * @return the expressions
-     */
-    public List<ParameterMetadata<?>> getExpressions() {
-        return Collections.unmodifiableList(expressions);
-    }
-
-    /**
-     * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-     *
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <T> ParameterMetadata<T> next(Part part) {
-
-        Assert.isTrue(parameters.hasNext(), String.format("No parameter available for part %s.", part));
-
-        JpaParameters.JpaParameter parameter = parameters.next();
-        return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-    }
-
-    /**
-     * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-     * {@link Parameters} as well.
-     *
-     * @param <T>
-     * @param type must not be {@literal null}.
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-        JpaParameters.JpaParameter parameter = parameters.next();
-        Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-        return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-    }
-
-    /**
-     * Builds a new {@link ParameterMetadata} for the given type and name.
-     *
-     * @param <T>
-     * @param part must not be {@literal null}.
-     * @param type must not be {@literal null}.
-     * @param parameter
-     * @return
-     */
-    private <T> ParameterMetadata<T> next(Part part, Class<T> type, JpaParameters.JpaParameter parameter) {
-
-        Assert.notNull(type, "Type must not be null!");
-
-        /*
-         * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-         */
-        @SuppressWarnings("unchecked")
-        Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-        ParameterExpression<T> expression = parameter.isExplicitlyNamed()
-                ? builder.parameter(reifiedType, parameter.getParameterName())
-                : builder.parameter(reifiedType);
-        ParameterMetadata<T> value = new ParameterMetadataImpl<T>(expression, part.getType(),
-                bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next(),
-                this.persistenceProvider);
-        expressions.add(value);
-
-        return value;
-    }
-
-    /**
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     * @param <T>
-     */
-    public static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-        private final Type type;
-        private final ParameterExpression<T> expression;
-        private final PersistenceProvider persistenceProvider;
-
-        /**
-         * Creates a new {@link ParameterMetadata}.
-         *
-         * @param expression
-         * @param type
-         * @param value
-         * @param provider
-         */
-        public ParameterMetadataImpl(ParameterExpression<T> expression, Type type, Object value, PersistenceProvider provider) {
-
-            this.expression = expression;
-            this.persistenceProvider = provider;
-            this.type = value == null && Type.SIMPLE_PROPERTY.equals(type) ? Type.IS_NULL : type;
-        }
-
-        /**
-         * Returns the {@link ParameterExpression}.
-         *
-         * @return the expression
-         */
-        public ParameterExpression<T> getExpression() {
-            return expression;
-        }
-
-        /**
-         * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-         *
-         * @return
-         */
-        public boolean isIsNullParameter() {
-            return Type.IS_NULL.equals(type);
-        }
-
-        /**
-         * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-         *
-         * @param value must not be {@literal null}.
-         * @return
-         */
-        public Object prepare(Object value) {
-
-            Assert.notNull(value, "Value must not be null!");
-
-            Class<? extends T> expressionType = expression.getJavaType();
-
-            if (String.class.equals(expressionType)) {
-
-                switch (type) {
-                    case STARTING_WITH:
-                        return String.format("%s%%", value.toString());
-                    case ENDING_WITH:
-                        return String.format("%%%s", value.toString());
-                    case CONTAINING:
-                    case NOT_CONTAINING:
-                        return String.format("%%%s%%", value.toString());
-                    default:
-                        return value;
-                }
-            }
-
-            return Collection.class.isAssignableFrom(expressionType)
-                    ? persistenceProvider.potentiallyConvertEmptyCollection(toCollection(value))
-                    : value;
-        }
-
-        /**
-         * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-         * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-         * {@link Collections}.
-         *
-         * @param value
-         * @return
-         */
-        private static Collection<?> toCollection(Object value) {
-
-            if (value == null) {
-                return null;
-            }
-
-            if (value instanceof Collection) {
-                return (Collection<?>) value;
-            }
-
-            if (ObjectUtils.isArray(value)) {
-                return Arrays.asList(ObjectUtils.toObjectArray(value));
-            }
-
-            return Collections.singleton(value);
-        }
-    }
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index 03f418f822..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, null, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(values).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, Object[] values) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(values);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable == null) {
-            return 0;
-        }
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return pageable.getOffset();
-        }
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable == null) {
-            return Integer.MAX_VALUE;
-        }
-        return pageable.getPageSize();
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(this.getEntityManager(), entityGraph, this.getQueryMethod().getEntityInformation().getJavaType());
-    }
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index cdb1f40472..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.query.EvaluationContextProvider;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.cbf = cbf;
-        this.evm = evm;
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, Class<?> customImplementationClass) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, super.getRepositoryInformation(metadata, customImplementationClass));
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected Object getTargetRepository(RepositoryInformation information) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    public <T> T getRepository(Class<T> repositoryInterface, Object customImplementation) {
-        if (postProcessors != null && postProcessors.get(postProcessors.size() - 1) != entityViewReplacingMethodInterceptor) {
-            addRepositoryProxyPostProcessor(entityViewReplacingMethodInterceptor);
-        }
-        return super.getRepository(repositoryInterface, customImplementation);
-    }
-
-    @Override
-    protected QueryLookupStrategy getQueryLookupStrategy(QueryLookupStrategy.Key key, EvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return new CreateQueryLookupStrategy(entityManager, extractor, cbf, evm);
-            case USE_DECLARED_QUERY:
-                return new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider));
-            case CREATE_IF_NOT_FOUND:
-                return new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider)));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Make the protected method public for BlazeRepositoryFactoryBeanSupport
-    @Override
-    public List<QueryMethod> getQueryMethods() {
-        return super.getQueryMethods();
-    }
-
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index a680e8b100..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-    }
-
-    public char getEscapeCharacter() {
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index 143635ca4d..0000000000
--- a/integration/spring-data/1.x/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<V, E, ID> implements EntityViewRepository<V, ID>, EntityViewSpecificationExecutor<V, E> {
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(entityManager, entityGraph, entityType);
-    }
-
-    public <S extends E> S findOne(Example<S> example) {
-        try {
-            return getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult();
-        } catch (NoResultException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public V findOne(Specification<E> spec) {
-        try {
-            return (V) getQuery(spec, (Sort) null).getSingleResult();
-        } catch (NoResultException e) {
-            return null;
-        }
-    }
-
-    public E findById(ID id) {
-        return (E) findOne(id);
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.0/pom.xml b/integration/spring-data/2.0/pom.xml
deleted file mode 100644
index bab27685f9..0000000000
--- a/integration/spring-data/2.0/pom.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.0</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>4.3.3.RELEASE</version.spring>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.0}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 3432869450..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index d52fc04dbe..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c08da86c7d..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- * 
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends JpaParameters.JpaParameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider) {
-		this(builder, accessor.iterator(), (JpaParameters) accessor.getParameters(), provider);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider) {
-		this(builder, null, parameters, provider);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-										  JpaParameters parameters, PersistenceProvider provider) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 * 
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return Collections.unmodifiableList(expressions);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-
-		Assert.isTrue(parameters.hasNext(), String.format("No parameter available for part %s.", part));
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 * 
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 * 
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part.getType(), value, persistenceProvider);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Type type, Object value,
-				PersistenceProvider provider) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(type) ? Type.IS_NULL : type;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 * 
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 * 
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", value.toString());
-					case ENDING_WITH:
-						return String.format("%%%s", value.toString());
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", value.toString());
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? persistenceProvider.potentiallyConvertEmptyCollection(toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 * 
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-	}
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index f52cc0021f..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, null, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(values).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, Object[] values) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(values);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(this.getEntityManager(), entityGraph, this.getQueryMethod().getEntityInformation().getJavaType());
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 81c2c874cc..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.EvaluationContextProvider;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private ClassLoader classLoader;
-    private BeanFactory beanFactory;
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected Object getTargetRepository(RepositoryInformation information) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, EvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Make the protected method public for BlazeRepositoryFactoryBeanSupport
-    @Override
-    public List<QueryMethod> getQueryMethods() {
-        return super.getQueryMethods();
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(new ImplementationMethodExecutionInterceptor(composition));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryFactorySupport.RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index a680e8b100..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-    }
-
-    public char getEscapeCharacter() {
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index 9bc086ece3..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index f5e7f49724..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(entityManager, entityGraph, entityType);
-    }
-
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.1/pom.xml b/integration/spring-data/2.1/pom.xml
deleted file mode 100644
index f3a8d7dfc7..0000000000
--- a/integration/spring-data/2.1/pom.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.1</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>4.3.3.RELEASE</version.spring>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.1}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 3432869450..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index d52fc04dbe..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c90f6b06f4..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *  @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), (JpaParameters) accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *  @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-										  JpaParameters parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return Collections.unmodifiableList(expressions);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part.getType(), value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Type type, Object value,
-								 PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(type) ? Type.IS_NULL : type;
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? persistenceProvider.potentiallyConvertEmptyCollection(toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-	}
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index be1b14780f..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(values).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, Object[] values) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(values, true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, Object[] values) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(values);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(this.getEntityManager(), entityGraph, this.getQueryMethod().getEntityInformation().getJavaType());
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 1a18cc6296..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private BeanFactory beanFactory;
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Make the protected method public for BlazeRepositoryFactoryBeanSupport
-    @Override
-    public List<QueryMethod> getQueryMethods() {
-        return super.getQueryMethods();
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(new ImplementationMethodExecutionInterceptor(composition));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryFactorySupport.RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index 9bc086ece3..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index 9cb5c045a3..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(entityManager, entityGraph, entityType);
-    }
-}
diff --git a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.1/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.2/pom.xml b/integration/spring-data/2.2/pom.xml
deleted file mode 100644
index 60a2b79b1e..0000000000
--- a/integration/spring-data/2.2/pom.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.2</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>4.3.3.RELEASE</version.spring>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.2}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 3432869450..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index d52fc04dbe..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index 8bf734fbe9..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(this.getEntityManager(), entityGraph, this.getQueryMethod().getEntityInformation().getJavaType());
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 212fe4b523..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private BeanFactory beanFactory;
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Make the protected method public for BlazeRepositoryFactoryBeanSupport
-    @Override
-    public List<QueryMethod> getQueryMethods() {
-        return super.getQueryMethods();
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(new ImplementationMethodExecutionInterceptor(composition));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryFactorySupport.RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index 9bc086ece3..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index d465249e0d..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(entityManager, entityGraph, entityType);
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.2/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.3/pom.xml b/integration/spring-data/2.3/pom.xml
deleted file mode 100644
index 9e23ffc446..0000000000
--- a/integration/spring-data/2.3/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.3</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>${version.spring-data-2.3-spring}</version.spring>
-        <rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
-        <kotlin-coroutines>1.3.6</kotlin-coroutines>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-bom</artifactId>
-                <version>${kotlin-coroutines}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.3}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava-reactive-streams</artifactId>
-            <version>${rxjava-reactive-streams}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactive</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 69e3227f0b..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return repositoryInformation.getReturnType(method);
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 16f7d0ddb1..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.util.TypeInformation;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return metadata.getReturnType(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index 8bf734fbe9..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(this.getEntityManager(), entityGraph, this.getQueryMethod().getEntityInformation().getJavaType());
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index cc5d329cd5..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private QueryLookupStrategy.Key queryLookupStrategyKey;
-    private List<QueryCreationListener<?>> queryPostProcessors;
-    private NamedQueries namedQueries;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private QueryMethodEvaluationContextProvider evaluationContextProvider;
-    private BeanFactory beanFactory;
-
-    private final QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        this.namedQueries = PropertiesBasedNamedQueries.EMPTY;
-        this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
-        this.queryPostProcessors = new ArrayList<>();
-        this.queryPostProcessors.add(collectingListener);
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void setQueryLookupStrategyKey(QueryLookupStrategy.Key key) {
-        this.queryLookupStrategyKey = key;
-    }
-
-    @Override
-    public void setNamedQueries(NamedQueries namedQueries) {
-        this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries;
-    }
-
-    @Override
-    public void addQueryCreationListener(QueryCreationListener<?> listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.queryPostProcessors.add(listener);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    protected List<QueryMethod> getQueryMethods() {
-        return collectingListener.getQueryMethods();
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
-                evaluationContextProvider);
-        result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
-                namedQueries, queryPostProcessors));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(new ImplementationMethodExecutionInterceptor(composition));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryFactorySupport.RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index a9d9fcbaf7..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method)
-     */
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return this.metadata.getReturnType(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index d465249e0d..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        return Jpa21Utils.tryGetFetchGraphHints(entityManager, entityGraph, entityType);
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
deleted file mode 100644
index 5a8cb6633e..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class QueryCollectingQueryCreationListener implements QueryCreationListener<RepositoryQuery> {
-
-    private final List<QueryMethod> queryMethods = new ArrayList<>();
-
-    @Override
-    public void onCreation(RepositoryQuery query) {
-        this.queryMethods.add(query.getQueryMethod());
-    }
-
-    public List<QueryMethod> getQueryMethods() {
-        return queryMethods;
-    }
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
deleted file mode 100644
index ec5cda6fae..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2014-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.repository.util.NullableWrapper;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Simple domain service to convert query results into a dedicated type.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Jens Schauder
- */
-class QueryExecutionResultHandler {
-
-	private static final TypeDescriptor WRAPPER_TYPE = TypeDescriptor.valueOf(NullableWrapper.class);
-
-	private final GenericConversionService conversionService;
-
-	private final Object mutex = new Object();
-
-	// concurrent access guarded by mutex.
-	private Map<Method, ReturnTypeDescriptor> descriptorCache = Collections.emptyMap();
-
-	/**
-	 * Creates a new {@link QueryExecutionResultHandler}.
-	 */
-	public QueryExecutionResultHandler(GenericConversionService conversionService) {
-		this.conversionService = conversionService;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to match the return type of the given method.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param method must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public Object postProcessInvocationResult(@Nullable Object result, Method method) {
-
-		if (!processingRequired(result, method.getReturnType())) {
-			return result;
-		}
-
-		ReturnTypeDescriptor descriptor = getOrCreateReturnTypeDescriptor(method);
-
-		return postProcessInvocationResult(result, 0, descriptor);
-	}
-
-	private ReturnTypeDescriptor getOrCreateReturnTypeDescriptor(Method method) {
-
-		Map<Method, ReturnTypeDescriptor> descriptorCache = this.descriptorCache;
-		ReturnTypeDescriptor descriptor = descriptorCache.get(method);
-
-		if (descriptor == null) {
-
-			descriptor = ReturnTypeDescriptor.of(method);
-
-			Map<Method, ReturnTypeDescriptor> updatedDescriptorCache;
-
-			if (descriptorCache.isEmpty()) {
-				updatedDescriptorCache = Collections.singletonMap(method, descriptor);
-			} else {
-				updatedDescriptorCache = new HashMap<>(descriptorCache.size() + 1, 1);
-				updatedDescriptorCache.putAll(descriptorCache);
-				updatedDescriptorCache.put(method, descriptor);
-
-			}
-
-			synchronized (mutex) {
-				this.descriptorCache = updatedDescriptorCache;
-			}
-		}
-
-		return descriptor;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to the given type.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param nestingLevel
-	 * @param descriptor must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, ReturnTypeDescriptor descriptor) {
-
-		TypeDescriptor returnTypeDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel);
-
-		if (returnTypeDescriptor == null) {
-			return result;
-		}
-
-		Class<?> expectedReturnType = returnTypeDescriptor.getType();
-
-		result = unwrapOptional(result);
-
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
-
-			// For a wrapper type, try nested resolution first
-			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);
-
-			if (conversionRequired(WRAPPER_TYPE, returnTypeDescriptor)) {
-				return conversionService.convert(new NullableWrapper(result), returnTypeDescriptor);
-			}
-
-			if (result != null) {
-
-				TypeDescriptor source = TypeDescriptor.valueOf(result.getClass());
-
-				if (conversionRequired(source, returnTypeDescriptor)) {
-					return conversionService.convert(result, returnTypeDescriptor);
-				}
-			}
-		}
-
-		if (result != null) {
-
-			if (ReactiveWrapperConverters.supports(expectedReturnType)) {
-				return ReactiveWrapperConverters.toWrapper(result, expectedReturnType);
-			}
-
-			if (result instanceof Collection<?>) {
-
-				TypeDescriptor elementDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel + 1);
-				boolean requiresConversion = requiresConversion((Collection<?>) result, expectedReturnType, elementDescriptor);
-
-				if (!requiresConversion) {
-					return result;
-				}
-			}
-
-			TypeDescriptor resultDescriptor = TypeDescriptor.forObject(result);
-			return conversionService.canConvert(resultDescriptor, returnTypeDescriptor)
-					? conversionService.convert(result, returnTypeDescriptor)
-					: result;
-		}
-
-		return Map.class.equals(expectedReturnType) //
-				? CollectionFactory.createMap(expectedReturnType, 0) //
-				: null;
-
-	}
-	private boolean requiresConversion(Collection<?> collection, Class<?> expectedReturnType,
-			@Nullable TypeDescriptor elementDescriptor) {
-
-		if (Streamable.class.isAssignableFrom(expectedReturnType) || !expectedReturnType.isInstance(collection)) {
-			return true;
-		}
-
-		if (elementDescriptor == null || !Iterable.class.isAssignableFrom(expectedReturnType)) {
-			return false;
-		}
-
-		Class<?> type = elementDescriptor.getType();
-
-		for (Object o : collection) {
-
-			if (!type.isInstance(o)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether the configured {@link ConversionService} can convert between the given {@link TypeDescriptor}s and
-	 * the conversion will not be a no-op.
-	 *
-	 * @param source
-	 * @param target
-	 * @return
-	 */
-	private boolean conversionRequired(TypeDescriptor source, TypeDescriptor target) {
-
-		return conversionService.canConvert(source, target) //
-				&& !conversionService.canBypassConvert(source, target);
-	}
-
-	/**
-	 * Unwraps the given value if it's a JDK 8 {@link Optional}.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Object unwrapOptional(@Nullable Object source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return Optional.class.isInstance(source) //
-				? Optional.class.cast(source).orElse(null) //
-				: source;
-	}
-
-	/**
-	 * Returns whether we have to process the given source object in the first place.
-	 *
-	 * @param source can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @return
-	 */
-	private static boolean processingRequired(@Nullable Object source, Class<?> targetType) {
-
-		return !targetType.isInstance(source) //
-				|| source == null //
-				|| Collection.class.isInstance(source);
-	}
-
-	/**
-	 * Value object capturing {@link MethodParameter} and {@link TypeDescriptor}s for top and nested levels.
-	 */
-	static class ReturnTypeDescriptor {
-
-		private final MethodParameter methodParameter;
-		private final TypeDescriptor typeDescriptor;
-		private final @Nullable TypeDescriptor nestedTypeDescriptor;
-
-		private ReturnTypeDescriptor(Method method) {
-			this.methodParameter = new MethodParameter(method, -1);
-			this.typeDescriptor = TypeDescriptor.nested(this.methodParameter, 0);
-			this.nestedTypeDescriptor = TypeDescriptor.nested(this.methodParameter, 1);
-		}
-
-		/**
-		 * Create a {@link ReturnTypeDescriptor} from a {@link Method}.
-		 *
-		 * @param method
-		 * @return
-		 */
-		public static ReturnTypeDescriptor of(Method method) {
-			return new ReturnTypeDescriptor(method);
-		}
-
-		/**
-		 * Return the {@link TypeDescriptor} for a nested type declared within the method parameter described by
-		 * {@code nestingLevel} .
-		 *
-		 * @param nestingLevel the nesting level. {@code 0} is the first level, {@code 1} the next inner one.
-		 * @return the {@link TypeDescriptor} or {@literal null} if it could not be obtained.
-		 * @see TypeDescriptor#nested(MethodParameter, int)
-		 */
-		@Nullable
-		public TypeDescriptor getReturnTypeDescriptor(int nestingLevel) {
-
-			// optimizing for nesting level 0 and 1 (Optional<T>, List<T>)
-			// nesting level 2 (Optional<List<T>>) uses the slow path.
-
-			switch (nestingLevel) {
-				case 0:
-					return typeDescriptor;
-				case 1:
-					return nestedTypeDescriptor;
-				default:
-					return TypeDescriptor.nested(this.methodParameter, nestingLevel);
-			}
-		}
-	}
-}
diff --git a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutorMethodInterceptor.java b/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutorMethodInterceptor.java
deleted file mode 100644
index f806d9048c..0000000000
--- a/integration/spring-data/2.3/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutorMethodInterceptor.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright 2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import kotlin.coroutines.Continuation;
-import kotlinx.coroutines.reactive.AwaitKt;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.reactivestreams.Publisher;
-import org.springframework.core.KotlinDetector;
-import org.springframework.core.ResolvableType;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.data.util.KotlinReflectionUtils;
-import org.springframework.data.util.Pair;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * This {@link MethodInterceptor} intercepts calls to methods of the custom implementation and delegates the to it if
- * configured. Furthermore it resolves method calls to finders and triggers execution of them. You can rely on having a
- * custom repository implementation instance set if this returns true.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-class QueryExecutorMethodInterceptor implements MethodInterceptor {
-
-	private static final GenericConversionService CONVERSION_SERVICE;
-
-	static {
-		try {
-			Field field = RepositoryFactorySupport.class.getDeclaredField("CONVERSION_SERVICE");
-			field.setAccessible(true);
-			CONVERSION_SERVICE = (GenericConversionService) field.get(null);
-		} catch (Exception ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private final Map<Method, RepositoryQuery> queries;
-	private final Map<Method, QueryMethodInvoker> invocationMetadataCache = new ConcurrentReferenceHashMap<>();
-	private final QueryExecutionResultHandler resultHandler;
-	private final NamedQueries namedQueries;
-	private final List<QueryCreationListener<?>> queryPostProcessors;
-
-	/**
-	 * Creates a new {@link QueryExecutorMethodInterceptor}. Builds a model of {@link QueryMethod}s to be invoked on
-	 * execution of repository interface methods.
-	 */
-	public QueryExecutorMethodInterceptor(RepositoryInformation repositoryInformation,
-                                          ProjectionFactory projectionFactory, Optional<QueryLookupStrategy> queryLookupStrategy, NamedQueries namedQueries,
-                                          List<QueryCreationListener<?>> queryPostProcessors) {
-
-		this.namedQueries = namedQueries;
-		this.queryPostProcessors = queryPostProcessors;
-
-		this.resultHandler = new QueryExecutionResultHandler(CONVERSION_SERVICE);
-
-		if (!queryLookupStrategy.isPresent() && repositoryInformation.hasQueryMethods()) {
-
-			throw new IllegalStateException("You have defined query method in the repository but "
-					+ "you don't have any query lookup strategy defined. The "
-					+ "infrastructure apparently does not support query methods!");
-		}
-
-		this.queries = queryLookupStrategy //
-				.map(it -> mapMethodsToQuery(repositoryInformation, it, projectionFactory)) //
-				.orElse(Collections.emptyMap());
-	}
-
-	private Map<Method, RepositoryQuery> mapMethodsToQuery(RepositoryInformation repositoryInformation,
-			QueryLookupStrategy lookupStrategy, ProjectionFactory projectionFactory) {
-
-		return repositoryInformation.getQueryMethods().stream() //
-				.map(method -> lookupQuery(method, repositoryInformation, lookupStrategy, projectionFactory)) //
-				.peek(pair -> invokeListeners(pair.getSecond())) //
-				.collect(Pair.toMap());
-	}
-
-	private Pair<Method, RepositoryQuery> lookupQuery(Method method, RepositoryInformation information,
-			QueryLookupStrategy strategy, ProjectionFactory projectionFactory) {
-		return Pair.of(method, strategy.resolveQuery(method, information, projectionFactory, namedQueries));
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private void invokeListeners(RepositoryQuery query) {
-
-		for (QueryCreationListener listener : queryPostProcessors) {
-
-			ResolvableType typeArgument = ResolvableType.forClass(QueryCreationListener.class, listener.getClass())
-					.getGeneric(0);
-
-			if (typeArgument != null && typeArgument.isAssignableFrom(ResolvableType.forClass(query.getClass()))) {
-				listener.onCreation(query);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
-	 */
-	@Override
-	@Nullable
-	public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable {
-
-		Method method = invocation.getMethod();
-
-		QueryExecutionConverters.ExecutionAdapter executionAdapter = QueryExecutionConverters //
-				.getExecutionAdapter(method.getReturnType());
-
-		if (executionAdapter == null) {
-			return resultHandler.postProcessInvocationResult(doInvoke(invocation), method);
-		}
-
-		return executionAdapter //
-				.apply(() -> resultHandler.postProcessInvocationResult(doInvoke(invocation), method));
-	}
-
-	@Nullable
-	private Object doInvoke(MethodInvocation invocation) throws Throwable {
-
-		Method method = invocation.getMethod();
-
-		if (hasQueryFor(method)) {
-
-			QueryMethodInvoker invocationMetadata = invocationMetadataCache.get(method);
-
-			if (invocationMetadata == null) {
-				invocationMetadata = new QueryMethodInvoker(method);
-				invocationMetadataCache.put(method, invocationMetadata);
-			}
-
-			RepositoryQuery repositoryQuery = queries.get(method);
-			return invocationMetadata.invoke(repositoryQuery, invocation.getArguments());
-		}
-
-		return invocation.proceed();
-	}
-
-	/**
-	 * Returns whether we know of a query to execute for the given {@link Method};
-	 *
-	 * @param method
-	 * @return
-	 */
-	private boolean hasQueryFor(Method method) {
-		return queries.containsKey(method);
-	}
-
-	/**
-	 * Invoker for Query Methods. Considers
-	 */
-	static class QueryMethodInvoker {
-
-		private final boolean suspendedDeclaredMethod;
-		private final Class<?> returnedType;
-		private final boolean returnsReactiveType;
-
-		QueryMethodInvoker(Method invokedMethod) {
-
-			if (KotlinDetector.isKotlinReflectPresent()) {
-
-				this.suspendedDeclaredMethod = KotlinReflectionUtils.isSuspend(invokedMethod);
-				this.returnedType = this.suspendedDeclaredMethod ? KotlinReflectionUtils.getReturnType(invokedMethod)
-						: invokedMethod.getReturnType();
-			} else {
-
-				this.suspendedDeclaredMethod = false;
-				this.returnedType = invokedMethod.getReturnType();
-			}
-
-			this.returnsReactiveType = ReactiveWrappers.supports(returnedType);
-		}
-
-		@Nullable
-		public Object invoke(RepositoryQuery query, Object[] args) {
-			return suspendedDeclaredMethod ? invokeReactiveToSuspend(query, args) : query.execute(args);
-		}
-
-		@Nullable
-		@SuppressWarnings({ "unchecked", "ConstantConditions" })
-		private Object invokeReactiveToSuspend(RepositoryQuery query, Object[] args) {
-
-			/*
-			* Kotlin suspended functions are invoked with a synthetic Continuation parameter that keeps track of the Coroutine context.
-			* We're invoking a method without Continuation as we expect the method to return any sort of reactive type,
-			* therefore we need to strip the Continuation parameter.
-			*/
-			Continuation<Object> continuation = (Continuation) args[args.length - 1];
-			args[args.length - 1] = null;
-			Object result = query.execute(args);
-
-			if (returnsReactiveType) {
-				return ReactiveWrapperConverters.toWrapper(result, returnedType);
-			}
-
-			Publisher<?> publisher = result instanceof Publisher ? (Publisher<?>) result
-					: ReactiveWrapperConverters.toWrapper(result, Publisher.class);
-
-			return AwaitKt.awaitFirstOrNull(publisher, continuation);
-		}
-	}
-}
diff --git a/integration/spring-data/2.4/pom.xml b/integration/spring-data/2.4/pom.xml
deleted file mode 100644
index 89970d8ee1..0000000000
--- a/integration/spring-data/2.4/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.4</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>${version.spring-data-2.4-spring}</version.spring>
-        <rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
-        <kotlin-coroutines>1.3.6</kotlin-coroutines>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-bom</artifactId>
-                <version>${kotlin-coroutines}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.4}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava-reactive-streams</artifactId>
-            <version>${rxjava-reactive-streams}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactive</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 69e3227f0b..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return repositoryInformation.getReturnType(method);
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 16f7d0ddb1..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.util.TypeInformation;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return metadata.getReturnType(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index e8adbb21e0..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.jpa.repository.support.QueryHints;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        QueryHints fetchGraphHint = Jpa21Utils.getFetchGraphHint(
-                this.getEntityManager(),
-                entityGraph,
-                this.getQueryMethod()
-                        .getEntityInformation()
-                        .getJavaType()
-        );
-        Map<String, Object> map = new HashMap<>();
-        fetchGraphHint.forEach(map::put);
-        return map;
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 998561f353..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.aopalliance.aop.Advice;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryMethodInvocationListener;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private static final Constructor<Advice> IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR;
-    private static final Constructor<Advice> QUERY_EXECUTOR_METHOD_INTERCEPTOR;
-
-    static {
-        Constructor<Advice> implementationMethodExecutionInterceptor;
-        Constructor<Advice> queryExecutorMethodInterceptor;
-        try {
-            implementationMethodExecutionInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.RepositoryFactorySupport$ImplementationMethodExecutionInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            RepositoryComposition.class,
-                            List.class
-                    );
-            implementationMethodExecutionInterceptor.setAccessible(true);
-            queryExecutorMethodInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.QueryExecutorMethodInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            ProjectionFactory.class,
-                            Optional.class,
-                            NamedQueries.class,
-                            List.class,
-                            List.class
-                    );
-            queryExecutorMethodInterceptor.setAccessible(true);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-
-        IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR = implementationMethodExecutionInterceptor;
-        QUERY_EXECUTOR_METHOD_INTERCEPTOR = queryExecutorMethodInterceptor;
-    }
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private QueryLookupStrategy.Key queryLookupStrategyKey;
-    private List<QueryCreationListener<?>> queryPostProcessors;
-    private List<RepositoryMethodInvocationListener> methodInvocationListeners;
-    private NamedQueries namedQueries;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private QueryMethodEvaluationContextProvider evaluationContextProvider;
-    private BeanFactory beanFactory;
-
-    private final QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        this.namedQueries = PropertiesBasedNamedQueries.EMPTY;
-        this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
-        this.queryPostProcessors = new ArrayList<>();
-        this.queryPostProcessors.add(collectingListener);
-        this.methodInvocationListeners = new ArrayList<>();
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void setQueryLookupStrategyKey(QueryLookupStrategy.Key key) {
-        this.queryLookupStrategyKey = key;
-    }
-
-    @Override
-    public void setNamedQueries(NamedQueries namedQueries) {
-        this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries;
-    }
-
-    @Override
-    public void addQueryCreationListener(QueryCreationListener<?> listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.queryPostProcessors.add(listener);
-    }
-
-    @Override
-    public void addInvocationListener(RepositoryMethodInvocationListener listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.methodInvocationListeners.add(listener);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    protected List<QueryMethod> getQueryMethods() {
-        return collectingListener.getQueryMethods();
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                return lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            } catch (IllegalStateException e) {
-                return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-            }
-        }
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
-                evaluationContextProvider);
-        result.addAdvice(queryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
-                namedQueries, queryPostProcessors, methodInvocationListeners));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(implementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    private Advice implementationMethodExecutionInterceptor(
-            RepositoryInformation information,
-            RepositoryComposition composition,
-            List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR.newInstance(
-                    information,
-                    composition,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private Advice queryExecutorMethodInterceptor(RepositoryInformation repositoryInformation,
-                                                  ProjectionFactory projectionFactory, Optional<QueryLookupStrategy> queryLookupStrategy, NamedQueries namedQueries,
-                                                  List<QueryCreationListener<?>> queryPostProcessors,
-                                                  List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return QUERY_EXECUTOR_METHOD_INTERCEPTOR.newInstance(
-                    repositoryInformation,
-                    projectionFactory,
-                    queryLookupStrategy,
-                    namedQueries,
-                    queryPostProcessors,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index a9d9fcbaf7..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method)
-     */
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return this.metadata.getReturnType(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index ead0a4b932..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        Map<String, Object> map = new HashMap<>();
-        Jpa21Utils.getFetchGraphHint(entityManager, entityGraph, entityType).forEach( map::put );
-        return map;
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    public E getById(ID id) {
-        return (E) getReference(id);
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
deleted file mode 100644
index 5a8cb6633e..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class QueryCollectingQueryCreationListener implements QueryCreationListener<RepositoryQuery> {
-
-    private final List<QueryMethod> queryMethods = new ArrayList<>();
-
-    @Override
-    public void onCreation(RepositoryQuery query) {
-        this.queryMethods.add(query.getQueryMethod());
-    }
-
-    public List<QueryMethod> getQueryMethods() {
-        return queryMethods;
-    }
-}
diff --git a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java b/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
deleted file mode 100644
index ec5cda6fae..0000000000
--- a/integration/spring-data/2.4/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2014-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.repository.util.NullableWrapper;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Simple domain service to convert query results into a dedicated type.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Jens Schauder
- */
-class QueryExecutionResultHandler {
-
-	private static final TypeDescriptor WRAPPER_TYPE = TypeDescriptor.valueOf(NullableWrapper.class);
-
-	private final GenericConversionService conversionService;
-
-	private final Object mutex = new Object();
-
-	// concurrent access guarded by mutex.
-	private Map<Method, ReturnTypeDescriptor> descriptorCache = Collections.emptyMap();
-
-	/**
-	 * Creates a new {@link QueryExecutionResultHandler}.
-	 */
-	public QueryExecutionResultHandler(GenericConversionService conversionService) {
-		this.conversionService = conversionService;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to match the return type of the given method.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param method must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public Object postProcessInvocationResult(@Nullable Object result, Method method) {
-
-		if (!processingRequired(result, method.getReturnType())) {
-			return result;
-		}
-
-		ReturnTypeDescriptor descriptor = getOrCreateReturnTypeDescriptor(method);
-
-		return postProcessInvocationResult(result, 0, descriptor);
-	}
-
-	private ReturnTypeDescriptor getOrCreateReturnTypeDescriptor(Method method) {
-
-		Map<Method, ReturnTypeDescriptor> descriptorCache = this.descriptorCache;
-		ReturnTypeDescriptor descriptor = descriptorCache.get(method);
-
-		if (descriptor == null) {
-
-			descriptor = ReturnTypeDescriptor.of(method);
-
-			Map<Method, ReturnTypeDescriptor> updatedDescriptorCache;
-
-			if (descriptorCache.isEmpty()) {
-				updatedDescriptorCache = Collections.singletonMap(method, descriptor);
-			} else {
-				updatedDescriptorCache = new HashMap<>(descriptorCache.size() + 1, 1);
-				updatedDescriptorCache.putAll(descriptorCache);
-				updatedDescriptorCache.put(method, descriptor);
-
-			}
-
-			synchronized (mutex) {
-				this.descriptorCache = updatedDescriptorCache;
-			}
-		}
-
-		return descriptor;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to the given type.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param nestingLevel
-	 * @param descriptor must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, ReturnTypeDescriptor descriptor) {
-
-		TypeDescriptor returnTypeDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel);
-
-		if (returnTypeDescriptor == null) {
-			return result;
-		}
-
-		Class<?> expectedReturnType = returnTypeDescriptor.getType();
-
-		result = unwrapOptional(result);
-
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
-
-			// For a wrapper type, try nested resolution first
-			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);
-
-			if (conversionRequired(WRAPPER_TYPE, returnTypeDescriptor)) {
-				return conversionService.convert(new NullableWrapper(result), returnTypeDescriptor);
-			}
-
-			if (result != null) {
-
-				TypeDescriptor source = TypeDescriptor.valueOf(result.getClass());
-
-				if (conversionRequired(source, returnTypeDescriptor)) {
-					return conversionService.convert(result, returnTypeDescriptor);
-				}
-			}
-		}
-
-		if (result != null) {
-
-			if (ReactiveWrapperConverters.supports(expectedReturnType)) {
-				return ReactiveWrapperConverters.toWrapper(result, expectedReturnType);
-			}
-
-			if (result instanceof Collection<?>) {
-
-				TypeDescriptor elementDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel + 1);
-				boolean requiresConversion = requiresConversion((Collection<?>) result, expectedReturnType, elementDescriptor);
-
-				if (!requiresConversion) {
-					return result;
-				}
-			}
-
-			TypeDescriptor resultDescriptor = TypeDescriptor.forObject(result);
-			return conversionService.canConvert(resultDescriptor, returnTypeDescriptor)
-					? conversionService.convert(result, returnTypeDescriptor)
-					: result;
-		}
-
-		return Map.class.equals(expectedReturnType) //
-				? CollectionFactory.createMap(expectedReturnType, 0) //
-				: null;
-
-	}
-	private boolean requiresConversion(Collection<?> collection, Class<?> expectedReturnType,
-			@Nullable TypeDescriptor elementDescriptor) {
-
-		if (Streamable.class.isAssignableFrom(expectedReturnType) || !expectedReturnType.isInstance(collection)) {
-			return true;
-		}
-
-		if (elementDescriptor == null || !Iterable.class.isAssignableFrom(expectedReturnType)) {
-			return false;
-		}
-
-		Class<?> type = elementDescriptor.getType();
-
-		for (Object o : collection) {
-
-			if (!type.isInstance(o)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether the configured {@link ConversionService} can convert between the given {@link TypeDescriptor}s and
-	 * the conversion will not be a no-op.
-	 *
-	 * @param source
-	 * @param target
-	 * @return
-	 */
-	private boolean conversionRequired(TypeDescriptor source, TypeDescriptor target) {
-
-		return conversionService.canConvert(source, target) //
-				&& !conversionService.canBypassConvert(source, target);
-	}
-
-	/**
-	 * Unwraps the given value if it's a JDK 8 {@link Optional}.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Object unwrapOptional(@Nullable Object source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return Optional.class.isInstance(source) //
-				? Optional.class.cast(source).orElse(null) //
-				: source;
-	}
-
-	/**
-	 * Returns whether we have to process the given source object in the first place.
-	 *
-	 * @param source can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @return
-	 */
-	private static boolean processingRequired(@Nullable Object source, Class<?> targetType) {
-
-		return !targetType.isInstance(source) //
-				|| source == null //
-				|| Collection.class.isInstance(source);
-	}
-
-	/**
-	 * Value object capturing {@link MethodParameter} and {@link TypeDescriptor}s for top and nested levels.
-	 */
-	static class ReturnTypeDescriptor {
-
-		private final MethodParameter methodParameter;
-		private final TypeDescriptor typeDescriptor;
-		private final @Nullable TypeDescriptor nestedTypeDescriptor;
-
-		private ReturnTypeDescriptor(Method method) {
-			this.methodParameter = new MethodParameter(method, -1);
-			this.typeDescriptor = TypeDescriptor.nested(this.methodParameter, 0);
-			this.nestedTypeDescriptor = TypeDescriptor.nested(this.methodParameter, 1);
-		}
-
-		/**
-		 * Create a {@link ReturnTypeDescriptor} from a {@link Method}.
-		 *
-		 * @param method
-		 * @return
-		 */
-		public static ReturnTypeDescriptor of(Method method) {
-			return new ReturnTypeDescriptor(method);
-		}
-
-		/**
-		 * Return the {@link TypeDescriptor} for a nested type declared within the method parameter described by
-		 * {@code nestingLevel} .
-		 *
-		 * @param nestingLevel the nesting level. {@code 0} is the first level, {@code 1} the next inner one.
-		 * @return the {@link TypeDescriptor} or {@literal null} if it could not be obtained.
-		 * @see TypeDescriptor#nested(MethodParameter, int)
-		 */
-		@Nullable
-		public TypeDescriptor getReturnTypeDescriptor(int nestingLevel) {
-
-			// optimizing for nesting level 0 and 1 (Optional<T>, List<T>)
-			// nesting level 2 (Optional<List<T>>) uses the slow path.
-
-			switch (nestingLevel) {
-				case 0:
-					return typeDescriptor;
-				case 1:
-					return nestedTypeDescriptor;
-				default:
-					return TypeDescriptor.nested(this.methodParameter, nestingLevel);
-			}
-		}
-	}
-}
diff --git a/integration/spring-data/2.5/pom.xml b/integration/spring-data/2.5/pom.xml
deleted file mode 100644
index 69c164a854..0000000000
--- a/integration/spring-data/2.5/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.5</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>${version.spring-data-2.5-spring}</version.spring>
-        <rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
-        <kotlin-coroutines>1.3.6</kotlin-coroutines>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-bom</artifactId>
-                <version>${kotlin-coroutines}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.5}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava-reactive-streams</artifactId>
-            <version>${rxjava-reactive-streams}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactive</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 69e3227f0b..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return repositoryInformation.getReturnType(method);
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 16f7d0ddb1..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.util.TypeInformation;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return metadata.getReturnType(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index e8adbb21e0..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.jpa.repository.support.QueryHints;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        QueryHints fetchGraphHint = Jpa21Utils.getFetchGraphHint(
-                this.getEntityManager(),
-                entityGraph,
-                this.getQueryMethod()
-                        .getEntityInformation()
-                        .getJavaType()
-        );
-        Map<String, Object> map = new HashMap<>();
-        fetchGraphHint.forEach(map::put);
-        return map;
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 6128abbc33..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.aopalliance.aop.Advice;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryMethodInvocationListener;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private static final Constructor<Advice> IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR;
-    private static final Constructor<Advice> QUERY_EXECUTOR_METHOD_INTERCEPTOR;
-
-    static {
-        Constructor<Advice> implementationMethodExecutionInterceptor;
-        Constructor<Advice> queryExecutorMethodInterceptor;
-        try {
-            implementationMethodExecutionInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.RepositoryFactorySupport$ImplementationMethodExecutionInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            RepositoryComposition.class,
-                            List.class
-                    );
-            implementationMethodExecutionInterceptor.setAccessible(true);
-            queryExecutorMethodInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.QueryExecutorMethodInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            ProjectionFactory.class,
-                            Optional.class,
-                            NamedQueries.class,
-                            List.class,
-                            List.class
-                    );
-            queryExecutorMethodInterceptor.setAccessible(true);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-
-        IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR = implementationMethodExecutionInterceptor;
-        QUERY_EXECUTOR_METHOD_INTERCEPTOR = queryExecutorMethodInterceptor;
-    }
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private QueryLookupStrategy.Key queryLookupStrategyKey;
-    private List<QueryCreationListener<?>> queryPostProcessors;
-    private List<RepositoryMethodInvocationListener> methodInvocationListeners;
-    private NamedQueries namedQueries;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private QueryMethodEvaluationContextProvider evaluationContextProvider;
-    private BeanFactory beanFactory;
-
-    private final QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        this.namedQueries = PropertiesBasedNamedQueries.EMPTY;
-        this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
-        this.queryPostProcessors = new ArrayList<>();
-        this.queryPostProcessors.add(collectingListener);
-        this.methodInvocationListeners = new ArrayList<>();
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void setQueryLookupStrategyKey(QueryLookupStrategy.Key key) {
-        this.queryLookupStrategyKey = key;
-    }
-
-    @Override
-    public void setNamedQueries(NamedQueries namedQueries) {
-        this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries;
-    }
-
-    @Override
-    public void addQueryCreationListener(QueryCreationListener<?> listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.queryPostProcessors.add(listener);
-    }
-
-    @Override
-    public void addInvocationListener(RepositoryMethodInvocationListener listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.methodInvocationListeners.add(listener);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    protected List<QueryMethod> getQueryMethods() {
-        return collectingListener.getQueryMethods();
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                RepositoryQuery repositoryQuery = lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-                // Only return something if the RepositoryQuery is not an instance of org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.NoQuery
-                // Since we can't refer to the class though, we instead check if the returned class is an instance of AbstractJpaQuery,
-                // because we know that NoQuery is not matching that
-                if (repositoryQuery instanceof AbstractJpaQuery) {
-                    return repositoryQuery;
-                }
-            } catch (IllegalStateException e) {
-                // Ignore
-            }
-            return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
-                evaluationContextProvider);
-        result.addAdvice(queryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
-                namedQueries, queryPostProcessors, methodInvocationListeners));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(implementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    private Advice implementationMethodExecutionInterceptor(
-            RepositoryInformation information,
-            RepositoryComposition composition,
-            List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR.newInstance(
-                    information,
-                    composition,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private Advice queryExecutorMethodInterceptor(RepositoryInformation repositoryInformation,
-                                                  ProjectionFactory projectionFactory, Optional<QueryLookupStrategy> queryLookupStrategy, NamedQueries namedQueries,
-                                                  List<QueryCreationListener<?>> queryPostProcessors,
-                                                  List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return QUERY_EXECUTOR_METHOD_INTERCEPTOR.newInstance(
-                    repositoryInformation,
-                    projectionFactory,
-                    queryLookupStrategy,
-                    namedQueries,
-                    queryPostProcessors,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index a9d9fcbaf7..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method)
-     */
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return this.metadata.getReturnType(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index ead0a4b932..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        Map<String, Object> map = new HashMap<>();
-        Jpa21Utils.getFetchGraphHint(entityManager, entityGraph, entityType).forEach( map::put );
-        return map;
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    public E getById(ID id) {
-        return (E) getReference(id);
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
deleted file mode 100644
index 5a8cb6633e..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class QueryCollectingQueryCreationListener implements QueryCreationListener<RepositoryQuery> {
-
-    private final List<QueryMethod> queryMethods = new ArrayList<>();
-
-    @Override
-    public void onCreation(RepositoryQuery query) {
-        this.queryMethods.add(query.getQueryMethod());
-    }
-
-    public List<QueryMethod> getQueryMethods() {
-        return queryMethods;
-    }
-}
diff --git a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java b/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
deleted file mode 100644
index ec5cda6fae..0000000000
--- a/integration/spring-data/2.5/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2014-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.repository.util.NullableWrapper;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Simple domain service to convert query results into a dedicated type.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Jens Schauder
- */
-class QueryExecutionResultHandler {
-
-	private static final TypeDescriptor WRAPPER_TYPE = TypeDescriptor.valueOf(NullableWrapper.class);
-
-	private final GenericConversionService conversionService;
-
-	private final Object mutex = new Object();
-
-	// concurrent access guarded by mutex.
-	private Map<Method, ReturnTypeDescriptor> descriptorCache = Collections.emptyMap();
-
-	/**
-	 * Creates a new {@link QueryExecutionResultHandler}.
-	 */
-	public QueryExecutionResultHandler(GenericConversionService conversionService) {
-		this.conversionService = conversionService;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to match the return type of the given method.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param method must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public Object postProcessInvocationResult(@Nullable Object result, Method method) {
-
-		if (!processingRequired(result, method.getReturnType())) {
-			return result;
-		}
-
-		ReturnTypeDescriptor descriptor = getOrCreateReturnTypeDescriptor(method);
-
-		return postProcessInvocationResult(result, 0, descriptor);
-	}
-
-	private ReturnTypeDescriptor getOrCreateReturnTypeDescriptor(Method method) {
-
-		Map<Method, ReturnTypeDescriptor> descriptorCache = this.descriptorCache;
-		ReturnTypeDescriptor descriptor = descriptorCache.get(method);
-
-		if (descriptor == null) {
-
-			descriptor = ReturnTypeDescriptor.of(method);
-
-			Map<Method, ReturnTypeDescriptor> updatedDescriptorCache;
-
-			if (descriptorCache.isEmpty()) {
-				updatedDescriptorCache = Collections.singletonMap(method, descriptor);
-			} else {
-				updatedDescriptorCache = new HashMap<>(descriptorCache.size() + 1, 1);
-				updatedDescriptorCache.putAll(descriptorCache);
-				updatedDescriptorCache.put(method, descriptor);
-
-			}
-
-			synchronized (mutex) {
-				this.descriptorCache = updatedDescriptorCache;
-			}
-		}
-
-		return descriptor;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to the given type.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param nestingLevel
-	 * @param descriptor must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, ReturnTypeDescriptor descriptor) {
-
-		TypeDescriptor returnTypeDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel);
-
-		if (returnTypeDescriptor == null) {
-			return result;
-		}
-
-		Class<?> expectedReturnType = returnTypeDescriptor.getType();
-
-		result = unwrapOptional(result);
-
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
-
-			// For a wrapper type, try nested resolution first
-			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);
-
-			if (conversionRequired(WRAPPER_TYPE, returnTypeDescriptor)) {
-				return conversionService.convert(new NullableWrapper(result), returnTypeDescriptor);
-			}
-
-			if (result != null) {
-
-				TypeDescriptor source = TypeDescriptor.valueOf(result.getClass());
-
-				if (conversionRequired(source, returnTypeDescriptor)) {
-					return conversionService.convert(result, returnTypeDescriptor);
-				}
-			}
-		}
-
-		if (result != null) {
-
-			if (ReactiveWrapperConverters.supports(expectedReturnType)) {
-				return ReactiveWrapperConverters.toWrapper(result, expectedReturnType);
-			}
-
-			if (result instanceof Collection<?>) {
-
-				TypeDescriptor elementDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel + 1);
-				boolean requiresConversion = requiresConversion((Collection<?>) result, expectedReturnType, elementDescriptor);
-
-				if (!requiresConversion) {
-					return result;
-				}
-			}
-
-			TypeDescriptor resultDescriptor = TypeDescriptor.forObject(result);
-			return conversionService.canConvert(resultDescriptor, returnTypeDescriptor)
-					? conversionService.convert(result, returnTypeDescriptor)
-					: result;
-		}
-
-		return Map.class.equals(expectedReturnType) //
-				? CollectionFactory.createMap(expectedReturnType, 0) //
-				: null;
-
-	}
-	private boolean requiresConversion(Collection<?> collection, Class<?> expectedReturnType,
-			@Nullable TypeDescriptor elementDescriptor) {
-
-		if (Streamable.class.isAssignableFrom(expectedReturnType) || !expectedReturnType.isInstance(collection)) {
-			return true;
-		}
-
-		if (elementDescriptor == null || !Iterable.class.isAssignableFrom(expectedReturnType)) {
-			return false;
-		}
-
-		Class<?> type = elementDescriptor.getType();
-
-		for (Object o : collection) {
-
-			if (!type.isInstance(o)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether the configured {@link ConversionService} can convert between the given {@link TypeDescriptor}s and
-	 * the conversion will not be a no-op.
-	 *
-	 * @param source
-	 * @param target
-	 * @return
-	 */
-	private boolean conversionRequired(TypeDescriptor source, TypeDescriptor target) {
-
-		return conversionService.canConvert(source, target) //
-				&& !conversionService.canBypassConvert(source, target);
-	}
-
-	/**
-	 * Unwraps the given value if it's a JDK 8 {@link Optional}.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Object unwrapOptional(@Nullable Object source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return Optional.class.isInstance(source) //
-				? Optional.class.cast(source).orElse(null) //
-				: source;
-	}
-
-	/**
-	 * Returns whether we have to process the given source object in the first place.
-	 *
-	 * @param source can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @return
-	 */
-	private static boolean processingRequired(@Nullable Object source, Class<?> targetType) {
-
-		return !targetType.isInstance(source) //
-				|| source == null //
-				|| Collection.class.isInstance(source);
-	}
-
-	/**
-	 * Value object capturing {@link MethodParameter} and {@link TypeDescriptor}s for top and nested levels.
-	 */
-	static class ReturnTypeDescriptor {
-
-		private final MethodParameter methodParameter;
-		private final TypeDescriptor typeDescriptor;
-		private final @Nullable TypeDescriptor nestedTypeDescriptor;
-
-		private ReturnTypeDescriptor(Method method) {
-			this.methodParameter = new MethodParameter(method, -1);
-			this.typeDescriptor = TypeDescriptor.nested(this.methodParameter, 0);
-			this.nestedTypeDescriptor = TypeDescriptor.nested(this.methodParameter, 1);
-		}
-
-		/**
-		 * Create a {@link ReturnTypeDescriptor} from a {@link Method}.
-		 *
-		 * @param method
-		 * @return
-		 */
-		public static ReturnTypeDescriptor of(Method method) {
-			return new ReturnTypeDescriptor(method);
-		}
-
-		/**
-		 * Return the {@link TypeDescriptor} for a nested type declared within the method parameter described by
-		 * {@code nestingLevel} .
-		 *
-		 * @param nestingLevel the nesting level. {@code 0} is the first level, {@code 1} the next inner one.
-		 * @return the {@link TypeDescriptor} or {@literal null} if it could not be obtained.
-		 * @see TypeDescriptor#nested(MethodParameter, int)
-		 */
-		@Nullable
-		public TypeDescriptor getReturnTypeDescriptor(int nestingLevel) {
-
-			// optimizing for nesting level 0 and 1 (Optional<T>, List<T>)
-			// nesting level 2 (Optional<List<T>>) uses the slow path.
-
-			switch (nestingLevel) {
-				case 0:
-					return typeDescriptor;
-				case 1:
-					return nestedTypeDescriptor;
-				default:
-					return TypeDescriptor.nested(this.methodParameter, nestingLevel);
-			}
-		}
-	}
-}
diff --git a/integration/spring-data/2.6/pom.xml b/integration/spring-data/2.6/pom.xml
deleted file mode 100644
index 71badf6088..0000000000
--- a/integration/spring-data/2.6/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.6</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>${version.spring-data-2.6-spring}</version.spring>
-        <rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
-        <kotlin-coroutines>1.3.6</kotlin-coroutines>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-bom</artifactId>
-                <version>${kotlin-coroutines}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.6}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava-reactive-streams</artifactId>
-            <version>${rxjava-reactive-streams}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactive</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index 1b8de9b8c2..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return repositoryInformation.getReturnType(method);
-    }
-
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 31c486e5af..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.util.TypeInformation;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return metadata.getReturnType(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index e8adbb21e0..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.jpa.repository.support.QueryHints;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        QueryHints fetchGraphHint = Jpa21Utils.getFetchGraphHint(
-                this.getEntityManager(),
-                entityGraph,
-                this.getQueryMethod()
-                        .getEntityInformation()
-                        .getJavaType()
-        );
-        Map<String, Object> map = new HashMap<>();
-        fetchGraphHint.forEach(map::put);
-        return map;
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 6128abbc33..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.aopalliance.aop.Advice;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryMethodInvocationListener;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private static final Constructor<Advice> IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR;
-    private static final Constructor<Advice> QUERY_EXECUTOR_METHOD_INTERCEPTOR;
-
-    static {
-        Constructor<Advice> implementationMethodExecutionInterceptor;
-        Constructor<Advice> queryExecutorMethodInterceptor;
-        try {
-            implementationMethodExecutionInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.RepositoryFactorySupport$ImplementationMethodExecutionInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            RepositoryComposition.class,
-                            List.class
-                    );
-            implementationMethodExecutionInterceptor.setAccessible(true);
-            queryExecutorMethodInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.QueryExecutorMethodInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            ProjectionFactory.class,
-                            Optional.class,
-                            NamedQueries.class,
-                            List.class,
-                            List.class
-                    );
-            queryExecutorMethodInterceptor.setAccessible(true);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-
-        IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR = implementationMethodExecutionInterceptor;
-        QUERY_EXECUTOR_METHOD_INTERCEPTOR = queryExecutorMethodInterceptor;
-    }
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private QueryLookupStrategy.Key queryLookupStrategyKey;
-    private List<QueryCreationListener<?>> queryPostProcessors;
-    private List<RepositoryMethodInvocationListener> methodInvocationListeners;
-    private NamedQueries namedQueries;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private QueryMethodEvaluationContextProvider evaluationContextProvider;
-    private BeanFactory beanFactory;
-
-    private final QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        this.namedQueries = PropertiesBasedNamedQueries.EMPTY;
-        this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
-        this.queryPostProcessors = new ArrayList<>();
-        this.queryPostProcessors.add(collectingListener);
-        this.methodInvocationListeners = new ArrayList<>();
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void setQueryLookupStrategyKey(QueryLookupStrategy.Key key) {
-        this.queryLookupStrategyKey = key;
-    }
-
-    @Override
-    public void setNamedQueries(NamedQueries namedQueries) {
-        this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries;
-    }
-
-    @Override
-    public void addQueryCreationListener(QueryCreationListener<?> listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.queryPostProcessors.add(listener);
-    }
-
-    @Override
-    public void addInvocationListener(RepositoryMethodInvocationListener listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.methodInvocationListeners.add(listener);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    protected List<QueryMethod> getQueryMethods() {
-        return collectingListener.getQueryMethods();
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                RepositoryQuery repositoryQuery = lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-                // Only return something if the RepositoryQuery is not an instance of org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.NoQuery
-                // Since we can't refer to the class though, we instead check if the returned class is an instance of AbstractJpaQuery,
-                // because we know that NoQuery is not matching that
-                if (repositoryQuery instanceof AbstractJpaQuery) {
-                    return repositoryQuery;
-                }
-            } catch (IllegalStateException e) {
-                // Ignore
-            }
-            return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
-                evaluationContextProvider);
-        result.addAdvice(queryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
-                namedQueries, queryPostProcessors, methodInvocationListeners));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(implementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    private Advice implementationMethodExecutionInterceptor(
-            RepositoryInformation information,
-            RepositoryComposition composition,
-            List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR.newInstance(
-                    information,
-                    composition,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private Advice queryExecutorMethodInterceptor(RepositoryInformation repositoryInformation,
-                                                  ProjectionFactory projectionFactory, Optional<QueryLookupStrategy> queryLookupStrategy, NamedQueries namedQueries,
-                                                  List<QueryCreationListener<?>> queryPostProcessors,
-                                                  List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return QUERY_EXECUTOR_METHOD_INTERCEPTOR.newInstance(
-                    repositoryInformation,
-                    projectionFactory,
-                    queryLookupStrategy,
-                    namedQueries,
-                    queryPostProcessors,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index a9d9fcbaf7..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method)
-     */
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return this.metadata.getReturnType(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index e4faaa9b86..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.repository.query.FluentQuery;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        Map<String, Object> map = new HashMap<>();
-        Jpa21Utils.getFetchGraphHint(entityManager, entityGraph, entityType).forEach( map::put );
-        return map;
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    public E getById(ID id) {
-        return (E) getReference(id);
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-
-    @Override
-    public <S extends E> long count(Example<S> example) {
-        return super.count(example);
-    }
-
-    @Override
-    public <S extends E> boolean exists(Example<S> example) {
-        return super.exists(example);
-    }
-
-    @Override
-    public <S extends E, R> R findBy(Example<S> example, Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
-        Assert.notNull(example, "Sample must not be null!");
-        Assert.notNull(queryFunction, "Query function must not be null!");
-
-        Function<Sort, TypedQuery<S>> finder = sort -> {
-
-            ExampleSpecification<S> spec = new ExampleSpecification<>(example, escapeCharacter);
-            Class<S> probeType = example.getProbeType();
-
-            return getQuery(spec, probeType, sort);
-        };
-
-        FluentQuery.FetchableFluentQuery<S> fluentQuery = new FetchableFluentQueryByExample<>(example, finder, this::count, this::exists, getEntityManager(), this.escapeCharacter);
-
-        return queryFunction.apply(fluentQuery);
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java
deleted file mode 100644
index b75aa5f66f..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2021-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.Subgraph;
-import javax.persistence.TypedQuery;
-
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
-import org.springframework.data.support.PageableExecutionUtils;
-import org.springframework.util.Assert;
-
-/**
- * Immutable implementation of {@link FetchableFluentQuery} based on Query by {@link Example}. All methods that return a
- * {@link FetchableFluentQuery} will return a new instance, not the original.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 2.6 and 2.7.
- *
- * @param <S> Domain type
- * @param <R> Result type
- * @author Greg Turnquist
- * @author Mark Paluch
- * @author Jens Schauder
- * @author J.R. Onyschak
- * @since 2.6
- */
-public class FetchableFluentQueryByExample<S, R> extends FluentQuerySupport<S, R> implements FetchableFluentQuery<R> {
-
-    private final Example<S> example;
-    private final Function<Sort, TypedQuery<S>> finder;
-    private final Function<Example<S>, Long> countOperation;
-    private final Function<Example<S>, Boolean> existsOperation;
-    private final EntityManager entityManager;
-    private final EscapeCharacter escapeCharacter;
-
-    public FetchableFluentQueryByExample(Example<S> example, Function<Sort, TypedQuery<S>> finder,
-                                         Function<Example<S>, Long> countOperation, Function<Example<S>, Boolean> existsOperation,
-                                         EntityManager entityManager, EscapeCharacter escapeCharacter) {
-        this(example, example.getProbeType(), (Class<R>) example.getProbeType(), Sort.unsorted(), Collections.emptySet(),
-             finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    private FetchableFluentQueryByExample(Example<S> example, Class<S> entityType, Class<R> returnType, Sort sort,
-                                          Collection<String> properties, Function<Sort, TypedQuery<S>> finder, Function<Example<S>, Long> countOperation,
-                                          Function<Example<S>, Boolean> existsOperation,
-                                          EntityManager entityManager, EscapeCharacter escapeCharacter) {
-
-        super(returnType, sort, properties, entityType);
-        this.example = example;
-        this.finder = finder;
-        this.countOperation = countOperation;
-        this.existsOperation = existsOperation;
-        this.entityManager = entityManager;
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#sortBy(org.springframework.data.domain.Sort)
-     */
-    @Override
-    public FetchableFluentQuery<R> sortBy(Sort sort) {
-
-        Assert.notNull(sort, "Sort must not be null!");
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, this.sort.and(sort), properties,
-                                                   finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
-     */
-    @Override
-    public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
-
-        Assert.notNull(resultType, "Projection target type must not be null!");
-        if (!resultType.isInterface()) {
-            throw new UnsupportedOperationException("Class-based DTOs are not yet supported.");
-        }
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, properties, finder,
-                                                   countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
-     */
-    @Override
-    public FetchableFluentQuery<R> project(Collection<String> properties) {
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, mergeProperties(properties),
-                                                   finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue()
-     */
-    @Override
-    public R oneValue() {
-
-        TypedQuery<S> limitedQuery = createSortedAndProjectedQuery();
-        limitedQuery.setMaxResults(2); // Never need more than 2 values
-
-        List<S> results = limitedQuery.getResultList();
-
-        if (results.size() > 1) {
-            throw new IncorrectResultSizeDataAccessException(1);
-        }
-
-        return results.isEmpty() ? null : getConversionFunction().apply(results.get(0));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue()
-     */
-    @Override
-    public R firstValue() {
-
-        TypedQuery<S> limitedQuery = createSortedAndProjectedQuery();
-        limitedQuery.setMaxResults(1); // Never need more than 1 value
-
-        List<S> results = limitedQuery.getResultList();
-
-        return results.isEmpty() ? null : getConversionFunction().apply(results.get(0));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all()
-     */
-    @Override
-    public List<R> all() {
-
-        List<S> resultList = createSortedAndProjectedQuery().getResultList();
-
-        return convert(resultList);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable)
-     */
-    @Override
-    public Page<R> page(Pageable pageable) {
-        return pageable.isUnpaged() ? new PageImpl<>(all()) : readPage(pageable);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream()
-     */
-    @Override
-    public Stream<R> stream() {
-
-        return createSortedAndProjectedQuery() //
-            .getResultStream() //
-            .map(getConversionFunction());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count()
-     */
-    @Override
-    public long count() {
-        return countOperation.apply(example);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists()
-     */
-    @Override
-    public boolean exists() {
-        return existsOperation.apply(example);
-    }
-
-    private Page<R> readPage(Pageable pageable) {
-
-        TypedQuery<S> pagedQuery = createSortedAndProjectedQuery();
-
-        if (pageable.isPaged()) {
-            pagedQuery.setFirstResult((int) pageable.getOffset());
-            pagedQuery.setMaxResults(pageable.getPageSize());
-        }
-
-        List<R> paginatedResults = convert(pagedQuery.getResultList());
-
-        return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(example));
-    }
-
-    private TypedQuery<S> createSortedAndProjectedQuery() {
-
-        TypedQuery<S> query = finder.apply(sort);
-
-        if (!properties.isEmpty()) {
-            query.setHint("javax.persistence.fetchgraph", create(entityManager, entityType, properties));
-        }
-
-        return query;
-    }
-
-    private static <T> EntityGraph<T> create(EntityManager entityManager, Class<T> domainType, Set<String> properties) {
-
-        EntityGraph<T> entityGraph = entityManager.createEntityGraph(domainType);
-
-        for (String property : properties) {
-
-            Subgraph<Object> current = null;
-
-            for (PropertyPath path : PropertyPath.from(property, domainType)) {
-
-                if (path.hasNext()) {
-                    current = current == null ? entityGraph.addSubgraph(path.getSegment())
-                        : current.addSubgraph(path.getSegment());
-                    continue;
-                }
-
-                if (current == null) {
-                    entityGraph.addAttributeNodes(path.getSegment());
-                } else {
-                    current.addAttributeNodes(path.getSegment());
-
-                }
-            }
-        }
-
-        return entityGraph;
-    }
-
-    private List<R> convert(List<S> resultList) {
-
-        Function<Object, R> conversionFunction = getConversionFunction();
-        List<R> mapped = new ArrayList<>(resultList.size());
-
-        for (S s : resultList) {
-            mapped.add(conversionFunction.apply(s));
-        }
-        return mapped;
-    }
-
-    private Function<Object, R> getConversionFunction() {
-        return getConversionFunction(example.getProbeType(), resultType);
-    }
-
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java
deleted file mode 100644
index 3dfd21d820..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2021-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
-
-/**
- * Supporting class containing some state and convenience methods for building and executing fluent queries.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 2.6 and 2.7.
- *
- * @param <R> The resulting type of the query.
- * @author Greg Turnquist
- * @author Jens Schauder
- * @since 2.6
- */
-public abstract class FluentQuerySupport<S, R> {
-
-    protected final Class<R> resultType;
-    protected final Sort sort;
-    protected final Set<String> properties;
-    protected final Class<S> entityType;
-
-    private final SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
-
-    public FluentQuerySupport(Class<R> resultType, Sort sort, Collection<String> properties, Class<S> entityType) {
-
-        this.resultType = resultType;
-        this.sort = sort;
-
-        if (properties != null) {
-            this.properties = new HashSet<>(properties);
-        } else {
-            this.properties = Collections.emptySet();
-        }
-
-        this.entityType = entityType;
-    }
-
-    final Collection<String> mergeProperties(Collection<String> additionalProperties) {
-
-        Set<String> newProperties = new HashSet<>();
-        newProperties.addAll(properties);
-        newProperties.addAll(additionalProperties);
-        return Collections.unmodifiableCollection(newProperties);
-    }
-
-    @SuppressWarnings("unchecked")
-    final Function<Object, R> getConversionFunction(Class<S> inputType, Class<R> targetType) {
-
-        if (targetType.isAssignableFrom(inputType)) {
-            return (Function<Object, R>) Function.identity();
-        }
-
-        if (targetType.isInterface()) {
-            return o -> projectionFactory.createProjection(targetType, o);
-        }
-
-        return o -> DefaultConversionService.getSharedInstance().convert(o, targetType);
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
deleted file mode 100644
index 5a8cb6633e..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class QueryCollectingQueryCreationListener implements QueryCreationListener<RepositoryQuery> {
-
-    private final List<QueryMethod> queryMethods = new ArrayList<>();
-
-    @Override
-    public void onCreation(RepositoryQuery query) {
-        this.queryMethods.add(query.getQueryMethod());
-    }
-
-    public List<QueryMethod> getQueryMethods() {
-        return queryMethods;
-    }
-}
diff --git a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java b/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
deleted file mode 100644
index ec5cda6fae..0000000000
--- a/integration/spring-data/2.6/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2014-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.repository.util.NullableWrapper;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Simple domain service to convert query results into a dedicated type.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Jens Schauder
- */
-class QueryExecutionResultHandler {
-
-	private static final TypeDescriptor WRAPPER_TYPE = TypeDescriptor.valueOf(NullableWrapper.class);
-
-	private final GenericConversionService conversionService;
-
-	private final Object mutex = new Object();
-
-	// concurrent access guarded by mutex.
-	private Map<Method, ReturnTypeDescriptor> descriptorCache = Collections.emptyMap();
-
-	/**
-	 * Creates a new {@link QueryExecutionResultHandler}.
-	 */
-	public QueryExecutionResultHandler(GenericConversionService conversionService) {
-		this.conversionService = conversionService;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to match the return type of the given method.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param method must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public Object postProcessInvocationResult(@Nullable Object result, Method method) {
-
-		if (!processingRequired(result, method.getReturnType())) {
-			return result;
-		}
-
-		ReturnTypeDescriptor descriptor = getOrCreateReturnTypeDescriptor(method);
-
-		return postProcessInvocationResult(result, 0, descriptor);
-	}
-
-	private ReturnTypeDescriptor getOrCreateReturnTypeDescriptor(Method method) {
-
-		Map<Method, ReturnTypeDescriptor> descriptorCache = this.descriptorCache;
-		ReturnTypeDescriptor descriptor = descriptorCache.get(method);
-
-		if (descriptor == null) {
-
-			descriptor = ReturnTypeDescriptor.of(method);
-
-			Map<Method, ReturnTypeDescriptor> updatedDescriptorCache;
-
-			if (descriptorCache.isEmpty()) {
-				updatedDescriptorCache = Collections.singletonMap(method, descriptor);
-			} else {
-				updatedDescriptorCache = new HashMap<>(descriptorCache.size() + 1, 1);
-				updatedDescriptorCache.putAll(descriptorCache);
-				updatedDescriptorCache.put(method, descriptor);
-
-			}
-
-			synchronized (mutex) {
-				this.descriptorCache = updatedDescriptorCache;
-			}
-		}
-
-		return descriptor;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to the given type.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param nestingLevel
-	 * @param descriptor must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, ReturnTypeDescriptor descriptor) {
-
-		TypeDescriptor returnTypeDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel);
-
-		if (returnTypeDescriptor == null) {
-			return result;
-		}
-
-		Class<?> expectedReturnType = returnTypeDescriptor.getType();
-
-		result = unwrapOptional(result);
-
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
-
-			// For a wrapper type, try nested resolution first
-			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);
-
-			if (conversionRequired(WRAPPER_TYPE, returnTypeDescriptor)) {
-				return conversionService.convert(new NullableWrapper(result), returnTypeDescriptor);
-			}
-
-			if (result != null) {
-
-				TypeDescriptor source = TypeDescriptor.valueOf(result.getClass());
-
-				if (conversionRequired(source, returnTypeDescriptor)) {
-					return conversionService.convert(result, returnTypeDescriptor);
-				}
-			}
-		}
-
-		if (result != null) {
-
-			if (ReactiveWrapperConverters.supports(expectedReturnType)) {
-				return ReactiveWrapperConverters.toWrapper(result, expectedReturnType);
-			}
-
-			if (result instanceof Collection<?>) {
-
-				TypeDescriptor elementDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel + 1);
-				boolean requiresConversion = requiresConversion((Collection<?>) result, expectedReturnType, elementDescriptor);
-
-				if (!requiresConversion) {
-					return result;
-				}
-			}
-
-			TypeDescriptor resultDescriptor = TypeDescriptor.forObject(result);
-			return conversionService.canConvert(resultDescriptor, returnTypeDescriptor)
-					? conversionService.convert(result, returnTypeDescriptor)
-					: result;
-		}
-
-		return Map.class.equals(expectedReturnType) //
-				? CollectionFactory.createMap(expectedReturnType, 0) //
-				: null;
-
-	}
-	private boolean requiresConversion(Collection<?> collection, Class<?> expectedReturnType,
-			@Nullable TypeDescriptor elementDescriptor) {
-
-		if (Streamable.class.isAssignableFrom(expectedReturnType) || !expectedReturnType.isInstance(collection)) {
-			return true;
-		}
-
-		if (elementDescriptor == null || !Iterable.class.isAssignableFrom(expectedReturnType)) {
-			return false;
-		}
-
-		Class<?> type = elementDescriptor.getType();
-
-		for (Object o : collection) {
-
-			if (!type.isInstance(o)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether the configured {@link ConversionService} can convert between the given {@link TypeDescriptor}s and
-	 * the conversion will not be a no-op.
-	 *
-	 * @param source
-	 * @param target
-	 * @return
-	 */
-	private boolean conversionRequired(TypeDescriptor source, TypeDescriptor target) {
-
-		return conversionService.canConvert(source, target) //
-				&& !conversionService.canBypassConvert(source, target);
-	}
-
-	/**
-	 * Unwraps the given value if it's a JDK 8 {@link Optional}.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Object unwrapOptional(@Nullable Object source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return Optional.class.isInstance(source) //
-				? Optional.class.cast(source).orElse(null) //
-				: source;
-	}
-
-	/**
-	 * Returns whether we have to process the given source object in the first place.
-	 *
-	 * @param source can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @return
-	 */
-	private static boolean processingRequired(@Nullable Object source, Class<?> targetType) {
-
-		return !targetType.isInstance(source) //
-				|| source == null //
-				|| Collection.class.isInstance(source);
-	}
-
-	/**
-	 * Value object capturing {@link MethodParameter} and {@link TypeDescriptor}s for top and nested levels.
-	 */
-	static class ReturnTypeDescriptor {
-
-		private final MethodParameter methodParameter;
-		private final TypeDescriptor typeDescriptor;
-		private final @Nullable TypeDescriptor nestedTypeDescriptor;
-
-		private ReturnTypeDescriptor(Method method) {
-			this.methodParameter = new MethodParameter(method, -1);
-			this.typeDescriptor = TypeDescriptor.nested(this.methodParameter, 0);
-			this.nestedTypeDescriptor = TypeDescriptor.nested(this.methodParameter, 1);
-		}
-
-		/**
-		 * Create a {@link ReturnTypeDescriptor} from a {@link Method}.
-		 *
-		 * @param method
-		 * @return
-		 */
-		public static ReturnTypeDescriptor of(Method method) {
-			return new ReturnTypeDescriptor(method);
-		}
-
-		/**
-		 * Return the {@link TypeDescriptor} for a nested type declared within the method parameter described by
-		 * {@code nestingLevel} .
-		 *
-		 * @param nestingLevel the nesting level. {@code 0} is the first level, {@code 1} the next inner one.
-		 * @return the {@link TypeDescriptor} or {@literal null} if it could not be obtained.
-		 * @see TypeDescriptor#nested(MethodParameter, int)
-		 */
-		@Nullable
-		public TypeDescriptor getReturnTypeDescriptor(int nestingLevel) {
-
-			// optimizing for nesting level 0 and 1 (Optional<T>, List<T>)
-			// nesting level 2 (Optional<List<T>>) uses the slow path.
-
-			switch (nestingLevel) {
-				case 0:
-					return typeDescriptor;
-				case 1:
-					return nestedTypeDescriptor;
-				default:
-					return TypeDescriptor.nested(this.methodParameter, nestingLevel);
-			}
-		}
-	}
-}
diff --git a/integration/spring-data/2.7/pom.xml b/integration/spring-data/2.7/pom.xml
deleted file mode 100644
index fce1896b65..0000000000
--- a/integration/spring-data/2.7/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data 2.7</name>
-    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.impl</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
-        <rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
-        <kotlin-coroutines>1.3.6</kotlin-coroutines>
-        <main.java.version>1.8</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-bom</artifactId>
-                <version>${kotlin-coroutines}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-2.7}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava-reactive-streams</artifactId>
-            <version>${rxjava-reactive-streams}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactive</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
deleted file mode 100644
index 7ebdcda590..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/CriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.AbstractCriteriaQueryParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-
-/**
- * Concrete version for Spring Data 2.x.
- * 
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class CriteriaQueryParameterBinder extends AbstractCriteriaQueryParameterBinder {
-
-    public CriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        super(em, evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected int getOffset() {
-        Pageable pageable = getPageable();
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
deleted file mode 100644
index ab197b0093..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryInformation.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryInformation implements RepositoryInformation, EntityViewAwareRepositoryMetadata {
-
-    private final EntityViewAwareRepositoryMetadata metadata;
-    private final RepositoryInformation repositoryInformation;
-
-    public EntityViewAwareRepositoryInformation(EntityViewAwareRepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        this.metadata = metadata;
-        this.repositoryInformation = repositoryInformation;
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return metadata.getEntityViewManager();
-    }
-
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return repositoryInformation.getRepositoryBaseClass();
-    }
-
-    @Override
-    public boolean hasCustomMethod() {
-        return repositoryInformation.hasCustomMethod();
-    }
-
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return repositoryInformation.isCustomMethod(method);
-    }
-
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return repositoryInformation.isQueryMethod(method);
-    }
-
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-        return repositoryInformation.isBaseClassMethod(method);
-    }
-
-    @Override
-    public Streamable<Method> getQueryMethods() {
-        return repositoryInformation.getQueryMethods();
-    }
-
-    @Override
-    public Method getTargetClassMethod(Method method) {
-        return repositoryInformation.getTargetClassMethod(method);
-    }
-
-    @Override
-    public Class<? extends Serializable> getIdType() {
-        return (Class<? extends Serializable>) repositoryInformation.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return repositoryInformation.getDomainType();
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return metadata.getEntityViewType();
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return repositoryInformation.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return repositoryInformation.getReturnedDomainClass(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        return metadata.getReturnedEntityViewClass(method);
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return repositoryInformation.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return repositoryInformation.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return repositoryInformation.getAlternativeDomainTypes();
-    }
-
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return repositoryInformation.getReturnType(method);
-    }
-
-    @Override
-    public TypeInformation<?> getIdTypeInformation() {
-        return metadata.getIdTypeInformation();
-    }
-
-    @Override
-    public TypeInformation<?> getDomainTypeInformation() {
-        return metadata.getDomainTypeInformation();
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
deleted file mode 100644
index 56b520f4ee..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/EntityViewAwareRepositoryMetadataImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.util.TypeInformation;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareRepositoryMetadataImpl implements EntityViewAwareRepositoryMetadata {
-
-    private final RepositoryMetadata metadata;
-    private final EntityViewManager evm;
-    private final Class<?> domainType;
-    private final Class<?> entityViewType;
-
-    public EntityViewAwareRepositoryMetadataImpl(RepositoryMetadata metadata, EntityViewManager evm) {
-        this.metadata = metadata;
-        this.evm = evm;
-        Class<?> domainType = metadata.getDomainType();
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(domainType);
-        if (managedViewType == null) {
-            this.domainType = domainType;
-            this.entityViewType = null;
-        } else {
-            this.domainType = managedViewType.getEntityClass();
-            this.entityViewType = managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public EntityViewManager getEntityViewManager() {
-        return evm;
-    }
-
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    @Override
-    public Class<?> getDomainType() {
-        return domainType;
-    }
-
-    @Override
-    public Class<?> getEntityViewType() {
-        return entityViewType;
-    }
-
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return returnedDomainClass;
-        } else {
-            return managedViewType.getEntityClass();
-        }
-    }
-
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return metadata.getReturnType(method);
-    }
-
-    @Override
-    public Class<?> getReturnedEntityViewClass(Method method) {
-        Class<?> returnedDomainClass = metadata.getReturnedDomainClass(method);
-        ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(returnedDomainClass);
-        if (managedViewType == null) {
-            return null;
-        } else {
-            return managedViewType.getJavaType();
-        }
-    }
-
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-
-    @Override
-    public TypeInformation<?> getIdTypeInformation() {
-        return metadata.getIdTypeInformation();
-    }
-
-    @Override
-    public TypeInformation<?> getDomainTypeInformation() {
-        return metadata.getDomainTypeInformation();
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
deleted file mode 100644
index c6f59f065d..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/ParameterMetadataProviderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.ParameterExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov: Copied while implementing the shared interface to be able to share code between Spring Data integrations for 1.x and 2.x.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Jens Schauder
- * @author Andrey Kovalev
- */
-class ParameterMetadataProviderImpl implements ParameterMetadataProvider {
-
-	private final CriteriaBuilder builder;
-	private final Iterator<? extends Parameter> parameters;
-	private final List<ParameterMetadata<?>> expressions;
-	private final Iterator<Object> bindableParameterValues;
-	private final PersistenceProvider persistenceProvider;
-	private final EscapeCharacter escape;
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and
-	 * {@link ParametersParameterAccessor} with support for parameter value customizations via {@link PersistenceProvider}
-	 * .
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param accessor must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, ParametersParameterAccessor accessor,
-                                         PersistenceProvider provider, EscapeCharacter escape) {
-		this(builder, accessor.iterator(), accessor.getParameters(), provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} and {@link Parameters} with
-	 * support for parameter value customizations via {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	public ParameterMetadataProviderImpl(CriteriaBuilder builder, Parameters<?, ?> parameters, PersistenceProvider provider,
-                                         EscapeCharacter escape) {
-		this(builder, null, parameters, provider, escape);
-	}
-
-	/**
-	 * Creates a new {@link ParameterMetadataProviderImpl} from the given {@link CriteriaBuilder} an {@link Iterable} of all
-	 * bindable parameter values, and {@link Parameters} with support for parameter value customizations via
-	 * {@link PersistenceProvider}.
-	 *
-	 * @param builder must not be {@literal null}.
-	 * @param bindableParameterValues may be {@literal null}.
-	 * @param parameters must not be {@literal null}.
-	 * @param provider must not be {@literal null}.
-	 * @param escape
-	 */
-	private ParameterMetadataProviderImpl(CriteriaBuilder builder, Iterator<Object> bindableParameterValues,
-                                          Parameters<?, ?> parameters, PersistenceProvider provider, EscapeCharacter escape) {
-
-		Assert.notNull(builder, "CriteriaBuilder must not be null!");
-		Assert.notNull(parameters, "Parameters must not be null!");
-		Assert.notNull(provider, "PesistenceProvider must not be null!");
-
-		this.builder = builder;
-		this.parameters = parameters.getBindableParameters().iterator();
-		this.expressions = new ArrayList<>();
-		this.bindableParameterValues = bindableParameterValues;
-		this.persistenceProvider = provider;
-		this.escape = escape;
-	}
-
-	/**
-	 * Returns all {@link ParameterMetadata}s built.
-	 *
-	 * @return the expressions
-	 */
-	public List<ParameterMetadata<?>> getExpressions() {
-		return expressions;
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<T> next(Part part) {
-		if (!parameters.hasNext()) {
-			throw new IllegalArgumentException(String.format("No parameter available for part %s.", part));
-		}
-
-		Parameter parameter = parameters.next();
-		return (ParameterMetadata<T>) next(part, parameter.getType(), parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-	 * {@link Parameters} as well.
-	 *
-	 * @param <T> is the type parameter of the returend {@link ParameterMetadata}.
-	 * @param type must not be {@literal null}.
-	 * @return ParameterMetadata for the next parameter.
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type) {
-
-		Parameter parameter = parameters.next();
-		Class<?> typeToUse = ClassUtils.isAssignable(type, parameter.getType()) ? parameter.getType() : type;
-		return (ParameterMetadata<? extends T>) next(part, typeToUse, parameter);
-	}
-
-	/**
-	 * Builds a new {@link ParameterMetadata} for the given type and name.
-	 *
-	 * @param <T> type parameter for the returned {@link ParameterMetadata}.
-	 * @param part must not be {@literal null}.
-	 * @param type must not be {@literal null}.
-	 * @param parameter providing the name for the returned {@link ParameterMetadata}.
-	 * @return a new {@link ParameterMetadata} for the given type and name.
-	 */
-	private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parameter) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		/*
-		 * We treat Expression types as Object vales since the real value to be bound as a parameter is determined at query time.
-		 */
-		@SuppressWarnings("unchecked")
-		Class<T> reifiedType = Expression.class.equals(type) ? (Class<T>) Object.class : type;
-
-		Supplier<String> name = () -> parameter.getName()
-				.orElseThrow(() -> new IllegalArgumentException("o_O Parameter needs to be named"));
-
-		ParameterExpression<T> expression = parameter.isExplicitlyNamed() //
-				? builder.parameter(reifiedType, name.get()) //
-				: builder.parameter(reifiedType);
-
-		Object value = bindableParameterValues == null ? ParameterMetadata.PLACEHOLDER : bindableParameterValues.next();
-
-		ParameterMetadata<T> metadata = new ParameterMetadataImpl<>(expression, part, value, persistenceProvider, escape);
-		expressions.add(metadata);
-
-		return metadata;
-	}
-
-	EscapeCharacter getEscape() {
-		return escape;
-	}
-
-	/**
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @author Andrey Kovalev
-	 * @param <T>
-	 */
-	static class ParameterMetadataImpl<T> implements ParameterMetadata<T> {
-
-		private final Type type;
-		private final ParameterExpression<T> expression;
-		private final PersistenceProvider persistenceProvider;
-		private final EscapeCharacter escape;
-		private final boolean ignoreCase;
-
-		/**
-		 * Creates a new {@link ParameterMetadata}.
-		 */
-		public ParameterMetadataImpl(ParameterExpression<T> expression, Part part, Object value,
-				PersistenceProvider provider, EscapeCharacter escape) {
-
-			this.expression = expression;
-			this.persistenceProvider = provider;
-			this.type = value == null && Type.SIMPLE_PROPERTY.equals(part.getType()) ? Type.IS_NULL : part.getType();
-			this.ignoreCase = IgnoreCaseType.ALWAYS.equals(part.shouldIgnoreCase());
-			this.escape = escape;
-		}
-
-		/**
-		 * Returns the {@link ParameterExpression}.
-		 *
-		 * @return the expression
-		 */
-		public ParameterExpression<T> getExpression() {
-			return expression;
-		}
-
-		/**
-		 * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-		 */
-		public boolean isIsNullParameter() {
-			return Type.IS_NULL.equals(type);
-		}
-
-		/**
-		 * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-		 *
-		 * @param value must not be {@literal null}.
-		 */
-		public Object prepare(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-
-			Class<? extends T> expressionType = expression.getJavaType();
-
-			if (String.class.equals(expressionType)) {
-
-				switch (type) {
-					case STARTING_WITH:
-						return String.format("%s%%", escape.escape(value.toString()));
-					case ENDING_WITH:
-						return String.format("%%%s", escape.escape(value.toString()));
-					case CONTAINING:
-					case NOT_CONTAINING:
-						return String.format("%%%s%%", escape.escape(value.toString()));
-					default:
-						return value;
-				}
-			}
-
-			return Collection.class.isAssignableFrom(expressionType) //
-					? upperIfIgnoreCase(ignoreCase, toCollection(value)) //
-					: value;
-		}
-
-		/**
-		 * Returns the given argument as {@link Collection} which means it will return it as is if it's a
-		 * {@link Collections}, turn an array into an {@link ArrayList} or simply wrap any other value into a single element
-		 * {@link Collections}.
-		 *
-		 * @param value the value to be converted to a {@link Collection}.
-		 * @return the object itself as a {@link Collection} or a {@link Collection} constructed from the value.
-		 */
-		private static Collection<?> toCollection(Object value) {
-
-			if (value == null) {
-				return null;
-			}
-
-			if (value instanceof Collection) {
-				return (Collection<?>) value;
-			}
-
-			if (ObjectUtils.isArray(value)) {
-				return Arrays.asList(ObjectUtils.toObjectArray(value));
-			}
-
-			return Collections.singleton(value);
-		}
-
-		@SuppressWarnings("unchecked")
-		private static Collection<?> upperIfIgnoreCase(boolean ignoreCase, Collection<?> collection) {
-
-			if (!ignoreCase || CollectionUtils.isEmpty(collection)) {
-				return collection;
-			}
-
-			return ((Collection<String>) collection).stream() //
-					.map(it -> it == null //
-							? null //
-							: it.toUpperCase()) //
-					.collect(Collectors.toList());
-		}
-	}
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
deleted file mode 100644
index e8adbb21e0..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/query/PartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.base.query.AbstractPartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwareSliceImpl;
-import com.blazebit.persistence.spring.data.base.query.ParameterBinder;
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
-import org.springframework.data.jpa.repository.query.JpaQueryExecution;
-import org.springframework.data.jpa.repository.support.QueryHints;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class PartTreeBlazePersistenceQuery extends AbstractPartTreeBlazePersistenceQuery {
-
-    public PartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(method, em, persistenceProvider, escape, cbf, evm);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, accessor, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape) {
-        return new ParameterMetadataProviderImpl(builder, parameters, provider, (EscapeCharacter) escape);
-    }
-
-    @Override
-    protected JpaQueryExecution getExecution() {
-        if (getQueryMethod().isSliceQuery()) {
-            return new PartTreeBlazePersistenceQuery.SlicedExecution(getQueryMethod().getParameters());
-        } else if (getQueryMethod().isPageQuery()) {
-            return new PartTreeBlazePersistenceQuery.PagedExecution(getQueryMethod().getParameters());
-        } else if (isDelete()) {
-            return new PartTreeBlazePersistenceQuery.DeleteExecution(getEntityManager());
-        } else if (isExists()) {
-            return new PartTreeBlazePersistenceQuery.ExistsExecution();
-        } else {
-            return super.getExecution();
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} performing an exists check on the query.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class ExistsExecution extends JpaQueryExecution {
-
-        @Override
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            return !((PartTreeBlazePersistenceQuery) repositoryQuery).createQuery(jpaParametersParameterAccessor).getResultList().isEmpty();
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class SlicedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public SlicedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), false);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            return new KeysetAwareSliceImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * Uses the {@link com.blazebit.persistence.PaginatedCriteriaBuilder} API for executing the query.
-     *
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PagedExecution extends JpaQueryExecution {
-
-        private final Parameters<?, ?> parameters;
-
-        public PagedExecution(Parameters<?, ?> parameters) {
-            this.parameters = parameters;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected Object doExecute(AbstractJpaQuery repositoryQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query paginatedCriteriaBuilder = ((PartTreeBlazePersistenceQuery) repositoryQuery).createPaginatedQuery(jpaParametersParameterAccessor.getValues(), true);
-            PagedList<Object> resultList = (PagedList<Object>) paginatedCriteriaBuilder.getResultList();
-            Long total = resultList.getTotalSize();
-            ParameterAccessor accessor = new ParametersParameterAccessor(parameters, jpaParametersParameterAccessor.getValues());
-            Pageable pageable = accessor.getPageable();
-
-            if (total.equals(0L)) {
-                return new KeysetAwarePageImpl<>(Collections.emptyList(), total, null, pageable);
-            }
-
-            return new KeysetAwarePageImpl<>(resultList, pageable);
-        }
-    }
-
-    /**
-     * {@link JpaQueryExecution} removing entities matching the query.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     * @since 1.6
-     */
-    static class DeleteExecution extends JpaQueryExecution {
-
-        private final EntityManager em;
-
-        public DeleteExecution(EntityManager em) {
-            this.em = em;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.query.JpaQueryExecution#doExecute(org.springframework.data.jpa.repository.query.AbstractJpaQuery, java.lang.Object[])
-         */
-        @Override
-        protected Object doExecute(AbstractJpaQuery jpaQuery, JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-            Query query = ((PartTreeBlazePersistenceQuery) jpaQuery).createQuery(jpaParametersParameterAccessor);
-            List<?> resultList = query.getResultList();
-
-            for (Object o : resultList) {
-                em.remove(o);
-            }
-
-            return jpaQuery.getQueryMethod().isCollectionQuery() ? resultList : resultList.size();
-        }
-    }
-
-    @Override
-    protected Query doCreateQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected Query doCreateCountQuery(JpaParametersParameterAccessor jpaParametersParameterAccessor) {
-        return super.doCreateCountQuery(jpaParametersParameterAccessor.getValues());
-    }
-
-    @Override
-    protected boolean isCountProjection(PartTree tree) {
-        return tree.isCountProjection();
-    }
-
-    @Override
-    protected boolean isDelete(PartTree tree) {
-        return tree.isDelete();
-    }
-
-    @Override
-    protected boolean isExists(PartTree tree) {
-        return tree.isExistsProjection();
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable.isPaged()) {
-            if (pageable instanceof KeysetPageable) {
-                return ((KeysetPageable) pageable).getIntOffset();
-            } else {
-                return (int) pageable.getOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    protected int getLimit(Pageable pageable) {
-        if (pageable.isPaged()) {
-            return pageable.getPageSize();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    protected ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-        return new CriteriaQueryParameterBinder(getEntityManager(), evm, parameters, values, expressions);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType) {
-        QueryHints fetchGraphHint = Jpa21Utils.getFetchGraphHint(
-                this.getEntityManager(),
-                entityGraph,
-                this.getQueryMethod()
-                        .getEntityInformation()
-                        .getJavaType()
-        );
-        Map<String, Object> map = new HashMap<>();
-        fetchGraphHint.forEach(map::put);
-        return map;
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
deleted file mode 100644
index 6128abbc33..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareJpaQueryMethod;
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadata;
-import com.blazebit.persistence.spring.data.base.repository.EntityViewAwareCrudMethodMetadataPostProcessor;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryInformation;
-import com.blazebit.persistence.spring.data.impl.query.EntityViewAwareRepositoryMetadataImpl;
-import com.blazebit.persistence.spring.data.impl.query.PartTreeBlazePersistenceQuery;
-import com.blazebit.persistence.spring.data.repository.EntityViewReplacingMethodInterceptor;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.aopalliance.aop.Advice;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodInvocationValidator;
-import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.repository.core.support.RepositoryMethodInvocationListener;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * Partly copied from {@link JpaRepositoryFactory} to retain functionality but mostly original.
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class BlazePersistenceRepositoryFactory extends JpaRepositoryFactory {
-
-    private static final Constructor<Advice> IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR;
-    private static final Constructor<Advice> QUERY_EXECUTOR_METHOD_INTERCEPTOR;
-
-    static {
-        Constructor<Advice> implementationMethodExecutionInterceptor;
-        Constructor<Advice> queryExecutorMethodInterceptor;
-        try {
-            implementationMethodExecutionInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.RepositoryFactorySupport$ImplementationMethodExecutionInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            RepositoryComposition.class,
-                            List.class
-                    );
-            implementationMethodExecutionInterceptor.setAccessible(true);
-            queryExecutorMethodInterceptor = (Constructor<Advice>) Class.forName("org.springframework.data.repository.core.support.QueryExecutorMethodInterceptor")
-                    .getConstructor(
-                            RepositoryInformation.class,
-                            ProjectionFactory.class,
-                            Optional.class,
-                            NamedQueries.class,
-                            List.class,
-                            List.class
-                    );
-            queryExecutorMethodInterceptor.setAccessible(true);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-
-        IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR = implementationMethodExecutionInterceptor;
-        QUERY_EXECUTOR_METHOD_INTERCEPTOR = queryExecutorMethodInterceptor;
-    }
-
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final QueryExtractor extractor;
-    private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache;
-    private final EntityViewReplacingMethodInterceptor entityViewReplacingMethodInterceptor;
-    private List<RepositoryProxyPostProcessor> postProcessors;
-    private EntityViewAwareCrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor;
-    private Optional<Class<?>> repositoryBaseClass;
-    private QueryLookupStrategy.Key queryLookupStrategyKey;
-    private List<QueryCreationListener<?>> queryPostProcessors;
-    private List<RepositoryMethodInvocationListener> methodInvocationListeners;
-    private NamedQueries namedQueries;
-    private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
-    private ClassLoader classLoader;
-    private QueryMethodEvaluationContextProvider evaluationContextProvider;
-    private BeanFactory beanFactory;
-
-    private final QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
-
-    /**
-     * Creates a new {@link JpaRepositoryFactory}.
-     *
-     * @param entityManager must not be {@literal null}
-     * @param cbf
-     * @param evm
-     */
-    public BlazePersistenceRepositoryFactory(EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-        super(entityManager);
-        this.entityManager = entityManager;
-        this.extractor = PersistenceProvider.fromEntityManager(entityManager);
-        this.repositoryInformationCache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
-        this.cbf = cbf;
-        this.evm = evm;
-        this.namedQueries = PropertiesBasedNamedQueries.EMPTY;
-        this.evaluationContextProvider = QueryMethodEvaluationContextProvider.DEFAULT;
-        this.queryPostProcessors = new ArrayList<>();
-        this.queryPostProcessors.add(collectingListener);
-        this.methodInvocationListeners = new ArrayList<>();
-        addRepositoryProxyPostProcessor(this.crudMethodMetadataPostProcessor = new EntityViewAwareCrudMethodMetadataPostProcessor());
-        this.repositoryBaseClass = Optional.empty();
-        this.entityViewReplacingMethodInterceptor = new EntityViewReplacingMethodInterceptor(entityManager, evm);
-    }
-
-    @Override
-    public void setQueryLookupStrategyKey(QueryLookupStrategy.Key key) {
-        this.queryLookupStrategyKey = key;
-    }
-
-    @Override
-    public void setNamedQueries(NamedQueries namedQueries) {
-        this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries;
-    }
-
-    @Override
-    public void addQueryCreationListener(QueryCreationListener<?> listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.queryPostProcessors.add(listener);
-    }
-
-    @Override
-    public void addInvocationListener(RepositoryMethodInvocationListener listener) {
-        Assert.notNull(listener, "Listener must not be null!");
-        this.methodInvocationListeners.add(listener);
-    }
-
-    @Override
-    public void addRepositoryProxyPostProcessor(RepositoryProxyPostProcessor processor) {
-        if (crudMethodMetadataPostProcessor != null) {
-            Assert.notNull(processor, "RepositoryProxyPostProcessor must not be null!");
-            super.addRepositoryProxyPostProcessor(processor);
-            if (postProcessors == null) {
-                this.postProcessors = new ArrayList<>();
-            }
-            this.postProcessors.add(processor);
-        }
-    }
-
-    @Override
-    protected List<QueryMethod> getQueryMethods() {
-        return collectingListener.getQueryMethods();
-    }
-
-    @Override
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-        return crudMethodMetadataPostProcessor == null ? null : crudMethodMetadataPostProcessor.getCrudMethodMetadata();
-    }
-
-    @Override
-    protected RepositoryMetadata getRepositoryMetadata(Class<?> repositoryInterface) {
-        return new EntityViewAwareRepositoryMetadataImpl(super.getRepositoryMetadata(repositoryInterface), evm);
-    }
-
-    @Override
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-        return getRepositoryInformation(metadata, super.getRepositoryInformation(metadata, fragments));
-    }
-
-    protected RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata, RepositoryInformation repositoryInformation) {
-        return new EntityViewAwareRepositoryInformation((EntityViewAwareRepositoryMetadata) metadata, repositoryInformation);
-    }
-
-    @Override
-    protected void validate(RepositoryMetadata repositoryMetadata) {
-        super.validate(repositoryMetadata);
-
-        if (cbf.getService(EntityMetamodel.class).getEntity(repositoryMetadata.getDomainType()) == null) {
-            throw new InvalidDataAccessApiUsageException(
-                    String.format("Cannot implement repository %s when using a non-entity domain type %s. Only types annotated with @Entity are supported!",
-                            repositoryMetadata.getRepositoryInterface().getName(), repositoryMetadata.getDomainType().getName()));
-        }
-    }
-
-    @Override
-    protected JpaRepositoryImplementation<?, ?> getTargetRepository(RepositoryInformation information, EntityManager entityManager) {
-        if (information instanceof EntityViewAwareRepositoryInformation && information.getRepositoryBaseClass() == EntityViewAwareRepositoryImpl.class) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            AbstractEntityViewAwareRepository<?, ?, ?> entityViewAwareRepository = getTargetRepositoryViaReflection(information, entityInformation, entityManager, cbf, evm, ((EntityViewAwareRepositoryInformation) information).getEntityViewType());
-            entityViewAwareRepository.setRepositoryMethodMetadata(getCrudMethodMetadata());
-            return (JpaRepositoryImplementation<?, ?>) entityViewAwareRepository;
-        }
-        return super.getTargetRepository(information, entityManager);
-    }
-
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-        ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());
-        // Only use the entity view aware repository if the domain type has a single id attribute
-        if (managedType.getIdAttributes().size() == 1) {
-            // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-            return EntityViewAwareRepositoryImpl.class;
-        }
-        return super.getRepositoryBaseClass(metadata);
-    }
-
-    @Override
-    protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-        switch (key != null ? key : QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND) {
-            case CREATE:
-                return Optional.of(new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm));
-            case USE_DECLARED_QUERY:
-                return Optional.of(new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(key, evaluationContextProvider).get()));
-            case CREATE_IF_NOT_FOUND:
-                return Optional.of(new CreateIfNotFoundQueryLookupStrategy(entityManager, extractor, new CreateQueryLookupStrategy(entityManager, extractor, escapeCharacter, cbf, evm),
-                        new DelegateQueryLookupStrategy(super.getQueryLookupStrategy(QueryLookupStrategy.Key.USE_DECLARED_QUERY, evaluationContextProvider).get())));
-            default:
-                throw new IllegalArgumentException(String.format("Unsupported query lookup strategy %s!", key));
-        }
-    }
-
-    private static class CreateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final PersistenceProvider persistenceProvider;
-        private final EscapeCharacter escapeCharacter;
-        private final CriteriaBuilderFactory cbf;
-        private final EntityViewManager evm;
-
-        public CreateQueryLookupStrategy(EntityManager em, QueryExtractor extractor, EscapeCharacter escapeCharacter, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-            this.em = em;
-            this.provider = extractor;
-            this.persistenceProvider = PersistenceProvider.fromEntityManager(em);
-            this.escapeCharacter = escapeCharacter;
-            this.cbf = cbf;
-            this.evm = evm;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                // TODO: at some point, we might want to switch to the default if the repository doesn't contain entity views or keyset pagination
-                return new PartTreeBlazePersistenceQuery(new EntityViewAwareJpaQueryMethod(method, (EntityViewAwareRepositoryMetadata) metadata, factory, provider), em, persistenceProvider, escapeCharacter, cbf, evm);
-            } catch (RuntimeException e) {
-                throw new IllegalArgumentException(
-                        String.format("Could not create query metamodel for method %s!", method.toString()), e);
-            }
-        }
-    }
-
-    private static class DelegateQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final QueryLookupStrategy delegate;
-
-        public DelegateQueryLookupStrategy(QueryLookupStrategy delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            return delegate.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    private static class CreateIfNotFoundQueryLookupStrategy implements QueryLookupStrategy {
-
-        private final EntityManager em;
-        private final QueryExtractor provider;
-        private final DelegateQueryLookupStrategy lookupStrategy;
-        private final CreateQueryLookupStrategy createStrategy;
-
-        public CreateIfNotFoundQueryLookupStrategy(EntityManager em, QueryExtractor extractor,
-                                                   CreateQueryLookupStrategy createStrategy, DelegateQueryLookupStrategy lookupStrategy) {
-            this.em = em;
-            this.provider = extractor;
-            this.createStrategy = createStrategy;
-            this.lookupStrategy = lookupStrategy;
-        }
-
-        @Override
-        public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {
-            try {
-                RepositoryQuery repositoryQuery = lookupStrategy.resolveQuery(method, metadata, factory, namedQueries);
-                // Only return something if the RepositoryQuery is not an instance of org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.NoQuery
-                // Since we can't refer to the class though, we instead check if the returned class is an instance of AbstractJpaQuery,
-                // because we know that NoQuery is not matching that
-                if (repositoryQuery instanceof AbstractJpaQuery) {
-                    return repositoryQuery;
-                }
-            } catch (IllegalStateException e) {
-                // Ignore
-            }
-            return createStrategy.resolveQuery(method, metadata, factory, namedQueries);
-        }
-    }
-
-    // Mostly copied from RepositoryFactorySupport to be able to use a custom RepositoryInformation implementation
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        super.setBeanClassLoader(classLoader);
-        this.classLoader = classLoader;
-    }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        super.setBeanFactory(beanFactory);
-        this.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setRepositoryBaseClass(Class<?> repositoryBaseClass) {
-        super.setRepositoryBaseClass(repositoryBaseClass);
-        this.repositoryBaseClass = Optional.ofNullable(repositoryBaseClass);
-    }
-
-    private static final BiFunction<Method, Object[], Object[]> REACTIVE_ARGS_CONVERTER = (method, o) -> {
-
-        if (ReactiveWrappers.isAvailable()) {
-
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            Object[] converted = new Object[o.length];
-            for (int i = 0; i < parameterTypes.length; i++) {
-
-                Class<?> parameterType = parameterTypes[i];
-                Object value = o[i];
-
-                if (value == null) {
-                    continue;
-                }
-
-                if (!parameterType.isAssignableFrom(value.getClass())
-                        && ReactiveWrapperConverters.canConvert(value.getClass(), parameterType)) {
-
-                    converted[i] = ReactiveWrapperConverters.toWrapper(value, parameterType);
-                } else {
-                    converted[i] = value;
-                }
-            }
-
-            return converted;
-        }
-
-        return o;
-    };
-
-    /**
-     * Returns a repository instance for the given interface backed by an instance providing implementation logic for
-     * custom logic.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     * @param fragments must not be {@literal null}.
-     * @return
-     * @since 2.0
-     */
-    @SuppressWarnings({ "unchecked" })
-    public <T> T getRepository(Class<T> repositoryInterface, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(repositoryInterface, "Repository interface must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
-        RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
-        RepositoryInformation information = getRepositoryInformation(metadata, composition);
-
-        validate(information, composition);
-
-        Object target = getTargetRepository(information);
-
-        // Create proxy
-        ProxyFactory result = new ProxyFactory();
-        result.setTarget(target);
-        result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
-
-        if (MethodInvocationValidator.supports(repositoryInterface)) {
-            result.addAdvice(new MethodInvocationValidator());
-        }
-
-        result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
-        result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
-
-        postProcessors.forEach(processor -> processor.postProcess(result, information));
-
-        result.addAdvice(entityViewReplacingMethodInterceptor);
-        result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
-
-        ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
-        Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
-                evaluationContextProvider);
-        result.addAdvice(queryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
-                namedQueries, queryPostProcessors, methodInvocationListeners));
-
-        composition = composition.append(RepositoryFragment.implemented(target));
-        result.addAdvice(implementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
-
-        return (T) result.getProxy(classLoader);
-    }
-
-    private Advice implementationMethodExecutionInterceptor(
-            RepositoryInformation information,
-            RepositoryComposition composition,
-            List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return IMPLEMENTATION_METHOD_EXECUTION_INTERCEPTOR.newInstance(
-                    information,
-                    composition,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private Advice queryExecutorMethodInterceptor(RepositoryInformation repositoryInformation,
-                                                  ProjectionFactory projectionFactory, Optional<QueryLookupStrategy> queryLookupStrategy, NamedQueries namedQueries,
-                                                  List<QueryCreationListener<?>> queryPostProcessors,
-                                                  List<RepositoryMethodInvocationListener> methodInvocationListeners) {
-        try {
-            return QUERY_EXECUTOR_METHOD_INTERCEPTOR.newInstance(
-                    repositoryInformation,
-                    projectionFactory,
-                    queryLookupStrategy,
-                    namedQueries,
-                    queryPostProcessors,
-                    methodInvocationListeners
-            );
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * Validates the given repository interface as well as the given custom implementation.
-     *
-     * @param repositoryInformation
-     * @param composition
-     */
-    private void validate(RepositoryInformation repositoryInformation, RepositoryComposition composition) {
-
-        if (repositoryInformation.hasCustomMethod()) {
-
-            if (composition.isEmpty()) {
-
-                throw new IllegalArgumentException(
-                        String.format("You have custom methods in %s but not provided a custom implementation!",
-                                repositoryInformation.getRepositoryInterface()));
-            }
-
-            composition.validateImplementation();
-        }
-
-        validate(repositoryInformation);
-    }
-
-    private RepositoryInformation getRepositoryInformation(RepositoryMetadata metadata,
-                                                           RepositoryComposition composition) {
-
-        RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
-
-        return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
-
-            Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
-
-            return getRepositoryInformation(metadata, new DefaultRepositoryInformation(metadata, baseClass, composition));
-        });
-    }
-
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata, RepositoryComposition.RepositoryFragments fragments) {
-
-        Assert.notNull(metadata, "RepositoryMetadata must not be null!");
-        Assert.notNull(fragments, "RepositoryFragments must not be null!");
-
-        RepositoryComposition composition = getRepositoryComposition(metadata);
-        RepositoryComposition.RepositoryFragments repositoryAspects = getRepositoryFragments(metadata);
-
-        return composition.append(fragments).append(repositoryAspects);
-    }
-
-    /**
-     * Creates {@link RepositoryComposition} based on {@link RepositoryMetadata} for repository-specific method handling.
-     *
-     * @param metadata
-     * @return
-     */
-    private RepositoryComposition getRepositoryComposition(RepositoryMetadata metadata) {
-
-        RepositoryComposition composition = RepositoryComposition.empty();
-
-        if (metadata.isReactiveRepository()) {
-            return composition.withMethodLookup(MethodLookups.forReactiveTypes(metadata))
-                    .withArgumentConverter(REACTIVE_ARGS_CONVERTER);
-        }
-
-        return composition.withMethodLookup(MethodLookups.forRepositoryTypes(metadata));
-    }
-
-    private static class RepositoryInformationCacheKey {
-
-        String repositoryInterfaceName;
-        final long compositionHash;
-
-        /**
-         * Creates a new {@link RepositoryInformationCacheKey} for the given {@link RepositoryMetadata} and composition.
-         *
-         * @param metadata must not be {@literal null}.
-         * @param composition must not be {@literal null}.
-         */
-        public RepositoryInformationCacheKey(RepositoryMetadata metadata, RepositoryComposition composition) {
-
-            this.repositoryInterfaceName = metadata.getRepositoryInterface().getName();
-            this.compositionHash = composition.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof RepositoryInformationCacheKey)) {
-                return false;
-            }
-
-            RepositoryInformationCacheKey that = (RepositoryInformationCacheKey) o;
-
-            if (compositionHash != that.compositionHash) {
-                return false;
-            }
-            return repositoryInterfaceName != null ? repositoryInterfaceName.equals(that.repositoryInterfaceName) : that.repositoryInterfaceName == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = repositoryInterfaceName != null ? repositoryInterfaceName.hashCode() : 0;
-            result = 31 * result + (int) (compositionHash ^ (compositionHash >>> 32));
-            return result;
-        }
-    }
-
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
deleted file mode 100644
index eae5a9f783..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactoryBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class BlazePersistenceRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
-        TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
-
-    private EntityManager entityManager;
-
-    @Autowired
-    private CriteriaBuilderFactory cbf;
-
-    @Autowired
-    private EntityViewManager evm;
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean() {
-        super(null);
-    }
-
-    /**
-     * Creates a new {@link BlazePersistenceRepositoryFactoryBean} for the given repository interface.
-     *
-     * @param repositoryInterface must not be {@literal null}.
-     */
-    protected BlazePersistenceRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
-        super(repositoryInterface);
-    }
-
-    public boolean isSingleton() {
-        return true;
-    }
-
-    /**
-     * The {@link EntityManager} to be used.
-     *
-     * @param entityManager the entityManager to set
-     */
-    @PersistenceContext
-    public void setEntityManager(EntityManager entityManager) {
-        if (this.entityManager == null) {
-            this.entityManager = entityManager;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.blazebit.persistence.spring.data.impl.repository.BlazeRepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-     */
-    @Override
-    public void setMappingContext(MappingContext<?, ?> mappingContext) {
-        super.setMappingContext(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.data.repository.support.
-     * BlazeTransactionalRepositoryFactoryBeanSupport#doCreateRepositoryFactory()
-     */
-    @Override
-    protected BlazePersistenceRepositoryFactory doCreateRepositoryFactory() {
-        return createRepositoryFactory(entityManager);
-    }
-
-    /**
-     * Returns a {@link RepositoryFactorySupport}.
-     *
-     * @param entityManager
-     * @return
-     */
-    protected BlazePersistenceRepositoryFactory createRepositoryFactory(EntityManager entityManager) {
-        return new BlazePersistenceRepositoryFactory(entityManager, cbf, evm);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(entityManager, "EntityManager must not be null!");
-        super.afterPropertiesSet();
-    }
-
-    public void setEscapeCharacter(char escapeCharacter) {
-        // Needed to work with Spring Boot 2.1.4
-    }
-
-    public char getEscapeCharacter() {
-        // Needed to work with Spring Boot 2.1.4
-        return '\\';
-    }
-
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
deleted file mode 100644
index 444ab04dfd..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/DefaultRepositoryInformation.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.data.repository.core.CrudMethods;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryComposition;
-import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.springframework.data.repository.util.ClassUtils.isGenericRepositoryInterface;
-import static org.springframework.util.ReflectionUtils.makeAccessible;
-
-/**
- * Default implementation of {@link RepositoryInformation}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- */
-class DefaultRepositoryInformation implements RepositoryInformation {
-
-    private final Map<Method, Method> methodCache = new ConcurrentHashMap<>();
-
-    private final RepositoryMetadata metadata;
-    private final Class<?> repositoryBaseClass;
-    private final RepositoryComposition composition;
-    private final RepositoryComposition baseComposition;
-
-    /**
-     * Creates a new {@link DefaultRepositoryMetadata} for the given repository interface and repository base class.
-     *
-     * @param metadata must not be {@literal null}.
-     * @param repositoryBaseClass must not be {@literal null}.
-     * @param composition must not be {@literal null}.
-     */
-    public DefaultRepositoryInformation(RepositoryMetadata metadata, Class<?> repositoryBaseClass,
-                                        RepositoryComposition composition) {
-
-        Assert.notNull(metadata, "Repository metadata must not be null!");
-        Assert.notNull(repositoryBaseClass, "Repository base class must not be null!");
-        Assert.notNull(composition, "Repository composition must not be null!");
-
-        this.metadata = metadata;
-        this.repositoryBaseClass = repositoryBaseClass;
-        this.composition = composition;
-        this.baseComposition = RepositoryComposition.of(RepositoryFragment.structural(repositoryBaseClass)) //
-                .withArgumentConverter(composition.getArgumentConverter()) //
-                .withMethodLookup(composition.getMethodLookup());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass()
-     */
-    @Override
-    public Class<?> getDomainType() {
-        return metadata.getDomainType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass()
-     */
-    @Override
-    public Class<?> getIdType() {
-        return metadata.getIdType();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass()
-     */
-    @Override
-    public Class<?> getRepositoryBaseClass() {
-        return this.repositoryBaseClass;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public Method getTargetClassMethod(Method method) {
-
-        if (methodCache.containsKey(method)) {
-            return methodCache.get(method);
-        }
-
-        Method result = composition.findMethod(method).orElse(method);
-
-        if (!result.equals(method)) {
-            return cacheAndReturn(method, result);
-        }
-
-        return cacheAndReturn(method, baseComposition.findMethod(method).orElse(method));
-    }
-
-    private Method cacheAndReturn(Method key, Method value) {
-
-        if (value != null) {
-            makeAccessible(value);
-        }
-
-        methodCache.put(key, value);
-        return value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods()
-     */
-    @Override
-    public Streamable<Method> getQueryMethods() {
-
-        Set<Method> result = new HashSet<>();
-
-        for (Method method : getRepositoryInterface().getMethods()) {
-            method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
-            if (isQueryMethodCandidate(method)) {
-                result.add(method);
-            }
-        }
-
-        return Streamable.of(Collections.unmodifiableSet(result));
-    }
-
-    /**
-     * Checks whether the given method is a query method candidate.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryMethodCandidate(Method method) {
-        return !method.isBridge() && !method.isDefault() //
-                && !Modifier.isStatic(method.getModifiers()) //
-                && (isQueryAnnotationPresentOn(method) || !isCustomMethod(method) && !isBaseClassMethod(method));
-    }
-
-    /**
-     * Checks whether the given method contains a custom store specific query annotation annotated with
-     * {@link QueryAnnotation}. The method-hierarchy is also considered in the search for the annotation.
-     *
-     * @param method
-     * @return
-     */
-    private boolean isQueryAnnotationPresentOn(Method method) {
-
-        return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isCustomMethod(Method method) {
-        return composition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isQueryMethod(Method method) {
-        return getQueryMethods().stream().anyMatch(it -> it.equals(method));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method)
-     */
-    @Override
-    public boolean isBaseClassMethod(Method method) {
-
-        Assert.notNull(method, "Method must not be null!");
-        return baseComposition.findMethod(method).isPresent();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod()
-     */
-    @Override
-    public boolean hasCustomMethod() {
-
-        Class<?> repositoryInterface = getRepositoryInterface();
-
-        // No detection required if no typing interface was configured
-        if (isGenericRepositoryInterface(repositoryInterface)) {
-            return false;
-        }
-
-        for (Method method : repositoryInterface.getMethods()) {
-            if (isCustomMethod(method) && !isBaseClassMethod(method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface()
-     */
-    @Override
-    public Class<?> getRepositoryInterface() {
-        return metadata.getRepositoryInterface();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method)
-     */
-    @Override
-    public Class<?> getReturnedDomainClass(Method method) {
-        return metadata.getReturnedDomainClass(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method)
-     */
-    @Override
-    public TypeInformation<?> getReturnType(Method method) {
-        return this.metadata.getReturnType(method);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getIdTypeInformation()
-     */
-    @Override
-    public TypeInformation<?> getIdTypeInformation() {
-        return metadata.getIdTypeInformation();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getDomainTypeInformation()
-     */
-    @Override
-    public TypeInformation<?> getDomainTypeInformation() {
-        return metadata.getDomainTypeInformation();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods()
-     */
-    @Override
-    public CrudMethods getCrudMethods() {
-        return metadata.getCrudMethods();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository()
-     */
-    @Override
-    public boolean isPagingRepository() {
-        return metadata.isPagingRepository();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes()
-     */
-    @Override
-    public Set<Class<?>> getAlternativeDomainTypes() {
-        return metadata.getAlternativeDomainTypes();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository()
-     */
-    @Override
-    public boolean isReactiveRepository() {
-        return metadata.isReactiveRepository();
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
deleted file mode 100644
index e4faaa9b86..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/EntityViewAwareRepositoryImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
-import org.springframework.data.repository.query.FluentQuery;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-@Transactional(readOnly = true)
-public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> extends AbstractEntityViewAwareRepository<E, E, ID> implements JpaRepositoryImplementation<E, ID>, EntityViewRepository<E, ID>/*, EntityViewSpecificationExecutor<V, E>*/ { // Can't implement that interface because of clashing methods
-
-    public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        super(entityInformation, entityManager, cbf, evm, (Class<E>) entityViewClass);
-    }
-
-    @Override
-    protected Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType) {
-        Map<String, Object> map = new HashMap<>();
-        Jpa21Utils.getFetchGraphHint(entityManager, entityGraph, entityType).forEach( map::put );
-        return map;
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public <S extends E> Optional<S> findOne(Example<S> example) {
-        try {
-            return Optional.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findOne(Specification<E> spec) {
-        try {
-            return Optional.of((E) getQuery(spec, (Sort) null).getSingleResult());
-        } catch (NoResultException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    @WithBridgeMethods(value = Object.class, adapterMethod = "convert")
-    public Optional<E> findById(ID id) {
-        return Optional.ofNullable((E) findOne(id));
-    }
-
-    public E getById(ID id) {
-        return (E) getReference(id);
-    }
-
-    private Object convert(Optional<Object> optional, Class<?> targetType) {
-        return optional.orElse(null);
-    }
-
-    @Override
-    public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
-        // Ignore the Spring data version of the CrudMethodMetadata
-    }
-
-    @Override
-    protected int getOffset(Pageable pageable) {
-        if (pageable instanceof KeysetPageable) {
-            return ((KeysetPageable) pageable).getIntOffset();
-        } else {
-            return (int) pageable.getOffset();
-        }
-    }
-
-    @Override
-    public <S extends E> long count(Example<S> example) {
-        return super.count(example);
-    }
-
-    @Override
-    public <S extends E> boolean exists(Example<S> example) {
-        return super.exists(example);
-    }
-
-    @Override
-    public <S extends E, R> R findBy(Example<S> example, Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
-        Assert.notNull(example, "Sample must not be null!");
-        Assert.notNull(queryFunction, "Query function must not be null!");
-
-        Function<Sort, TypedQuery<S>> finder = sort -> {
-
-            ExampleSpecification<S> spec = new ExampleSpecification<>(example, escapeCharacter);
-            Class<S> probeType = example.getProbeType();
-
-            return getQuery(spec, probeType, sort);
-        };
-
-        FluentQuery.FetchableFluentQuery<S> fluentQuery = new FetchableFluentQueryByExample<>(example, finder, this::count, this::exists, getEntityManager(), this.escapeCharacter);
-
-        return queryFunction.apply(fluentQuery);
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java
deleted file mode 100644
index dcc5c03e15..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FetchableFluentQueryByExample.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright 2021-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
-import org.springframework.data.support.PageableExecutionUtils;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.Subgraph;
-import javax.persistence.TypedQuery;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-/**
- * Immutable implementation of {@link FetchableFluentQuery} based on Query by {@link Example}. All methods that return a
- * {@link FetchableFluentQuery} will return a new instance, not the original.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 2.6 and 2.7.
- *
- * @param <S> Domain type
- * @param <R> Result type
- * @author Greg Turnquist
- * @author Mark Paluch
- * @author Jens Schauder
- * @author J.R. Onyschak
- * @since 2.6
- */
-public class FetchableFluentQueryByExample<S, R> extends FluentQuerySupport<S, R> implements FetchableFluentQuery<R> {
-
-    private final Example<S> example;
-    private final Function<Sort, TypedQuery<S>> finder;
-    private final Function<Example<S>, Long> countOperation;
-    private final Function<Example<S>, Boolean> existsOperation;
-    private final EntityManager entityManager;
-    private final EscapeCharacter escapeCharacter;
-
-    public FetchableFluentQueryByExample(Example<S> example, Function<Sort, TypedQuery<S>> finder,
-                                         Function<Example<S>, Long> countOperation, Function<Example<S>, Boolean> existsOperation,
-                                         EntityManager entityManager, EscapeCharacter escapeCharacter) {
-        this(example, example.getProbeType(), (Class<R>) example.getProbeType(), Sort.unsorted(), Collections.emptySet(),
-             finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    private FetchableFluentQueryByExample(Example<S> example, Class<S> entityType, Class<R> returnType, Sort sort,
-                                          Collection<String> properties, Function<Sort, TypedQuery<S>> finder, Function<Example<S>, Long> countOperation,
-                                          Function<Example<S>, Boolean> existsOperation,
-                                          EntityManager entityManager, EscapeCharacter escapeCharacter) {
-
-        super(returnType, sort, properties, entityType);
-        this.example = example;
-        this.finder = finder;
-        this.countOperation = countOperation;
-        this.existsOperation = existsOperation;
-        this.entityManager = entityManager;
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#sortBy(org.springframework.data.domain.Sort)
-     */
-    @Override
-    public FetchableFluentQuery<R> sortBy(Sort sort) {
-
-        Assert.notNull(sort, "Sort must not be null!");
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, this.sort.and(sort), properties,
-                                                   finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
-     */
-    @Override
-    public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
-
-        Assert.notNull(resultType, "Projection target type must not be null!");
-        if (!resultType.isInterface()) {
-            throw new UnsupportedOperationException("Class-based DTOs are not yet supported.");
-        }
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, properties, finder,
-                                                   countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
-     */
-    @Override
-    public FetchableFluentQuery<R> project(Collection<String> properties) {
-
-        return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, mergeProperties(properties),
-                                                   finder, countOperation, existsOperation, entityManager, escapeCharacter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue()
-     */
-    @Override
-    public R oneValue() {
-
-        TypedQuery<S> limitedQuery = createSortedAndProjectedQuery();
-        limitedQuery.setMaxResults(2); // Never need more than 2 values
-
-        List<S> results = limitedQuery.getResultList();
-
-        if (results.size() > 1) {
-            throw new IncorrectResultSizeDataAccessException(1);
-        }
-
-        return results.isEmpty() ? null : getConversionFunction().apply(results.get(0));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue()
-     */
-    @Override
-    public R firstValue() {
-
-        TypedQuery<S> limitedQuery = createSortedAndProjectedQuery();
-        limitedQuery.setMaxResults(1); // Never need more than 1 value
-
-        List<S> results = limitedQuery.getResultList();
-
-        return results.isEmpty() ? null : getConversionFunction().apply(results.get(0));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all()
-     */
-    @Override
-    public List<R> all() {
-
-        List<S> resultList = createSortedAndProjectedQuery().getResultList();
-
-        return convert(resultList);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable)
-     */
-    @Override
-    public Page<R> page(Pageable pageable) {
-        return pageable.isUnpaged() ? new PageImpl<>(all()) : readPage(pageable);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream()
-     */
-    @Override
-    public Stream<R> stream() {
-
-        return createSortedAndProjectedQuery() //
-            .getResultStream() //
-            .map(getConversionFunction());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count()
-     */
-    @Override
-    public long count() {
-        return countOperation.apply(example);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists()
-     */
-    @Override
-    public boolean exists() {
-        return existsOperation.apply(example);
-    }
-
-    private Page<R> readPage(Pageable pageable) {
-
-        TypedQuery<S> pagedQuery = createSortedAndProjectedQuery();
-
-        if (pageable.isPaged()) {
-            pagedQuery.setFirstResult((int) pageable.getOffset());
-            pagedQuery.setMaxResults(pageable.getPageSize());
-        }
-
-        List<R> paginatedResults = convert(pagedQuery.getResultList());
-
-        return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(example));
-    }
-
-    private TypedQuery<S> createSortedAndProjectedQuery() {
-
-        TypedQuery<S> query = finder.apply(sort);
-
-        if (!properties.isEmpty()) {
-            query.setHint("javax.persistence.fetchgraph", create(entityManager, entityType, properties));
-        }
-
-        return query;
-    }
-
-    private static <T> EntityGraph<T> create(EntityManager entityManager, Class<T> domainType, Set<String> properties) {
-
-        EntityGraph<T> entityGraph = entityManager.createEntityGraph(domainType);
-
-        for (String property : properties) {
-
-            Subgraph<Object> current = null;
-
-            for (PropertyPath path : PropertyPath.from(property, domainType)) {
-
-                if (path.hasNext()) {
-                    current = current == null ? entityGraph.addSubgraph(path.getSegment())
-                        : current.addSubgraph(path.getSegment());
-                    continue;
-                }
-
-                if (current == null) {
-                    entityGraph.addAttributeNodes(path.getSegment());
-                } else {
-                    current.addAttributeNodes(path.getSegment());
-
-                }
-            }
-        }
-
-        return entityGraph;
-    }
-
-    private List<R> convert(List<S> resultList) {
-
-        Function<Object, R> conversionFunction = getConversionFunction();
-        List<R> mapped = new ArrayList<>(resultList.size());
-
-        for (S s : resultList) {
-            mapped.add(conversionFunction.apply(s));
-        }
-        return mapped;
-    }
-
-    private Function<Object, R> getConversionFunction() {
-        return getConversionFunction(example.getProbeType(), resultType);
-    }
-
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java
deleted file mode 100644
index 527f5becef..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/FluentQuerySupport.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2021-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-
-/**
- * Supporting class containing some state and convenience methods for building and executing fluent queries.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 2.6 and 2.7.
- *
- * @param <R> The resulting type of the query.
- * @author Greg Turnquist
- * @author Jens Schauder
- * @since 2.6
- */
-public abstract class FluentQuerySupport<S, R> {
-
-    protected final Class<R> resultType;
-    protected final Sort sort;
-    protected final Set<String> properties;
-    protected final Class<S> entityType;
-
-    private final SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
-
-    public FluentQuerySupport(Class<R> resultType, Sort sort, Collection<String> properties, Class<S> entityType) {
-
-        this.resultType = resultType;
-        this.sort = sort;
-
-        if (properties != null) {
-            this.properties = new HashSet<>(properties);
-        } else {
-            this.properties = Collections.emptySet();
-        }
-
-        this.entityType = entityType;
-    }
-
-    final Collection<String> mergeProperties(Collection<String> additionalProperties) {
-
-        Set<String> newProperties = new HashSet<>();
-        newProperties.addAll(properties);
-        newProperties.addAll(additionalProperties);
-        return Collections.unmodifiableCollection(newProperties);
-    }
-
-    @SuppressWarnings("unchecked")
-    final Function<Object, R> getConversionFunction(Class<S> inputType, Class<R> targetType) {
-
-        if (targetType.isAssignableFrom(inputType)) {
-            return (Function<Object, R>) Function.identity();
-        }
-
-        if (targetType.isInterface()) {
-            return o -> projectionFactory.createProjection(targetType, o);
-        }
-
-        return o -> DefaultConversionService.getSharedInstance().convert(o, targetType);
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
deleted file mode 100644
index 0955aec369..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/MethodLookups.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.MethodLookup;
-import org.springframework.data.repository.core.support.MethodLookup.MethodPredicate;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.springframework.core.GenericTypeResolver.resolveParameterType;
-
-/**
- * Implementations of method lookup functions.
- *
- * @author Mark Paluch
- * @author Oliver Gierke
- * @since 2.0
- */
-interface MethodLookups {
-
-    /**
-     * Direct method lookup filtering on exact method name, parameter count and parameter types.
-     *
-     * @return direct method lookup.
-     */
-    public static MethodLookup direct() {
-
-        MethodPredicate direct = (invoked, candidate) -> candidate.getName().equals(invoked.getName())
-                && candidate.getParameterCount() == invoked.getParameterCount()
-                && Arrays.equals(candidate.getParameterTypes(), invoked.getParameterTypes())
-                && candidate.getReturnType().equals(invoked.getMethod().getReturnType());
-
-        return () -> Collections.singletonList(direct);
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link RepositoryAwareMethodLookup}.
-     * <p/>
-     * Repository-aware lookups resolve generic types from the repository declaration to verify assignability to Id/domain
-     * types. This lookup also permits assignable method signatures but prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     */
-    public static MethodLookup forRepositoryTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new RepositoryAwareMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Repository type-aware method lookup composed of {@link #direct()} and {@link ReactiveTypeInteropMethodLookup}.
-     * <p/>
-     * This method lookup considers adaptability of reactive types in method signatures. Repository methods accepting a
-     * reactive type can be possibly called with a different reactive type if the reactive type can be adopted to the
-     * target type. This lookup also permits assignable method signatures and resolves repository id/entity types but
-     * prefers {@link #direct()} matches.
-     *
-     * @param repositoryMetadata must not be {@literal null}.
-     * @return the composed, repository-aware method lookup.
-     * @see #direct()
-     * @see #forRepositoryTypes(RepositoryMetadata)
-     */
-    public static MethodLookup forReactiveTypes(RepositoryMetadata repositoryMetadata) {
-        return direct().and(new ReactiveTypeInteropMethodLookup(repositoryMetadata));
-    }
-
-    /**
-     * Default {@link MethodLookup} considering repository Id and entity types permitting calls to methods with assignable
-     * arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class RepositoryAwareMethodLookup implements MethodLookup {
-
-        @SuppressWarnings("rawtypes") private static final TypeVariable<Class<Repository>>[] PARAMETERS = Repository.class
-                .getTypeParameters();
-        private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
-        private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
-
-        private final ResolvableType entityType, idType;
-        private final Class<?> repositoryInterface;
-
-        /**
-         * Creates a new {@link RepositoryAwareMethodLookup} for the given {@link RepositoryMetadata}.
-         *
-         * @param repositoryMetadata must not be {@literal null}.
-         */
-        public RepositoryAwareMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            Assert.notNull(repositoryMetadata, "Repository metadata must not be null!");
-
-            this.entityType = ResolvableType.forClass(repositoryMetadata.getDomainType());
-            this.idType = ResolvableType.forClass(repositoryMetadata.getIdType());
-            this.repositoryInterface = repositoryMetadata.getRepositoryInterface();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate detailedComparison = (invoked, candidate) -> Optional.of(candidate)
-                    .filter(baseClassMethod -> baseClassMethod.getName().equals(invoked.getName()))// Right name
-                    .filter(baseClassMethod -> baseClassMethod.getParameterCount() == invoked.getParameterCount())
-                    .filter(baseClassMethod -> parametersMatch(invoked.getMethod(), baseClassMethod))// All parameters match
-                    .isPresent();
-
-            return Collections.singletonList(detailedComparison);
-        }
-
-        /**
-         * Checks whether the given parameter type matches the generic type of the given parameter. Thus when {@literal PK}
-         * is declared, the method ensures that given method parameter is the primary key type declared in the given
-         * repository interface e.g.
-         *
-         * @param variable must not be {@literal null}.
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        protected boolean matchesGenericType(TypeVariable<?> variable, ResolvableType parameterType) {
-
-            GenericDeclaration declaration = variable.getGenericDeclaration();
-
-            if (declaration instanceof Class) {
-
-                if (ID_TYPE_NAME.equals(variable.getName()) && parameterType.isAssignableFrom(idType)) {
-                    return true;
-                }
-
-                Type boundType = variable.getBounds()[0];
-                String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
-
-                return DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType);
-            }
-
-            for (Type type : variable.getBounds()) {
-                if (ResolvableType.forType(type).isAssignableFrom(parameterType)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param invokedMethod
-         * @param candidate
-         * @return
-         */
-        private boolean parametersMatch(Method invokedMethod, Method candidate) {
-
-            Class<?>[] methodParameterTypes = invokedMethod.getParameterTypes();
-            Type[] genericTypes = candidate.getGenericParameterTypes();
-            Class<?>[] types = candidate.getParameterTypes();
-
-            for (int i = 0; i < genericTypes.length; i++) {
-
-                Type genericType = genericTypes[i];
-                Class<?> type = types[i];
-                MethodParameter parameter = new MethodParameter(invokedMethod, i);
-                Class<?> parameterType = resolveParameterType(parameter, repositoryInterface);
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType, ResolvableType.forMethodParameter(parameter))) {
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                if (types[i].equals(parameterType)) {
-                    continue;
-                }
-
-                if (!type.isAssignableFrom(parameterType) || !type.equals(methodParameterTypes[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Extension to {@link RepositoryAwareMethodLookup} considering reactive type adoption and entity types permitting
-     * calls to methods with assignable arguments.
-     *
-     * @author Mark Paluch
-     */
-    static class ReactiveTypeInteropMethodLookup extends RepositoryAwareMethodLookup {
-
-        private final RepositoryMetadata repositoryMetadata;
-
-        public ReactiveTypeInteropMethodLookup(RepositoryMetadata repositoryMetadata) {
-
-            super(repositoryMetadata);
-            this.repositoryMetadata = repositoryMetadata;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups()
-         */
-        @Override
-        public List<MethodPredicate> getLookups() {
-
-            MethodPredicate convertibleComparison = (invokedMethod, candidate) -> {
-
-                List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
-
-                if (usesParametersWithReactiveWrappers(invokedMethod.getMethod())) {
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, assignableWrapperMatch())); //
-                    suppliers.add(() -> getMethodCandidate(invokedMethod, candidate, wrapperConversionMatch()));
-                }
-
-                return suppliers.stream().anyMatch(supplier -> supplier.get().isPresent());
-            };
-
-            MethodPredicate detailedComparison = (invokedMethod, candidate) -> getMethodCandidate(invokedMethod, candidate,
-                    matchParameterOrComponentType(repositoryMetadata.getRepositoryInterface())).isPresent();
-
-            return Arrays.asList(convertibleComparison, detailedComparison);
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a parameters in which the declared parameter may be
-         * wrapped but supports unwrapping. Usually types like {@link Optional} or {@link Stream}.
-         *
-         * @param repositoryInterface
-         * @return
-         * @see QueryExecutionConverters
-         * @see #matchesGenericType
-         */
-        private Predicate<ParameterOverrideCriteria> matchParameterOrComponentType(Class<?> repositoryInterface) {
-
-            return (parameterCriteria) -> {
-
-                Class<?> parameterType = resolveParameterType(parameterCriteria.getDeclared(), repositoryInterface);
-                Type genericType = parameterCriteria.getGenericBaseType();
-
-                if (genericType instanceof TypeVariable<?>) {
-
-                    if (!matchesGenericType((TypeVariable<?>) genericType,
-                            ResolvableType.forMethodParameter(parameterCriteria.getDeclared()))) {
-                        return false;
-                    }
-                }
-
-                return parameterCriteria.getBaseType().isAssignableFrom(parameterType)
-                        && parameterCriteria.isAssignableFromDeclared();
-            };
-        }
-
-        /**
-         * Checks whether the type is a wrapper without unwrapping support. Reactive wrappers don't like to be unwrapped.
-         *
-         * @param parameterType must not be {@literal null}.
-         * @return
-         */
-        private static boolean isNonUnwrappingWrapper(Class<?> parameterType) {
-
-            Assert.notNull(parameterType, "Parameter type must not be null!");
-
-            return QueryExecutionConverters.supports(parameterType)
-                    && !QueryExecutionConverters.supportsUnwrapping(parameterType);
-        }
-
-        /**
-         * Returns whether the given {@link Method} uses a reactive wrapper type as parameter.
-         *
-         * @param method must not be {@literal null}.
-         * @return
-         */
-        private static boolean usesParametersWithReactiveWrappers(Method method) {
-
-            Assert.notNull(method, "Method must not be null!");
-
-            return Arrays.stream(method.getParameterTypes())//
-                    .anyMatch(ReactiveTypeInteropMethodLookup::isNonUnwrappingWrapper);
-        }
-
-        /**
-         * Returns a candidate method from the base class for the given one or the method given in the first place if none
-         * one the base class matches.
-         *
-         * @param method must not be {@literal null}.
-         * @param baseClass must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static Optional<Method> getMethodCandidate(InvokedMethod invokedMethod, Method candidate,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return Optional.of(candidate)//
-                    .filter(it -> invokedMethod.getName().equals(it.getName()))//
-                    .filter(it -> invokedMethod.getParameterCount() == it.getParameterCount())//
-                    .filter(it -> parametersMatch(it, invokedMethod.getMethod(), predicate));
-        }
-
-        /**
-         * Checks the given method's parameters to match the ones of the given base class method. Matches generic arguments
-         * against the ones bound in the given repository interface.
-         *
-         * @param baseClassMethod must not be {@literal null}.
-         * @param declaredMethod must not be {@literal null}.
-         * @param predicate must not be {@literal null}.
-         * @return
-         */
-        private static boolean parametersMatch(Method baseClassMethod, Method declaredMethod,
-                Predicate<ParameterOverrideCriteria> predicate) {
-
-            return methodParameters(baseClassMethod, declaredMethod).allMatch(predicate);
-        }
-
-        /**
-         * {@link Predicate} to check whether a method parameter is a {@link #isNonUnwrappingWrapper(Class)} and can be
-         * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> wrapperConversionMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && ReactiveWrapperConverters.canConvert(parameterCriteria.getDeclaredType(), parameterCriteria.getBaseType());
-        }
-
-        /**
-         * {@link Predicate} to check parameter assignability between a {@link #isNonUnwrappingWrapper(Class)} parameter and
-         * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
-         * conversion.
-         *
-         * @return
-         */
-        private static Predicate<ParameterOverrideCriteria> assignableWrapperMatch() {
-
-            return (parameterCriteria) -> isNonUnwrappingWrapper(parameterCriteria.getBaseType()) //
-                    && isNonUnwrappingWrapper(parameterCriteria.getDeclaredType()) //
-                    && parameterCriteria.getBaseType().isAssignableFrom(parameterCriteria.getDeclaredType());
-        }
-
-        private static Stream<ParameterOverrideCriteria> methodParameters(Method first, Method second) {
-
-            Assert.isTrue(first.getParameterCount() == second.getParameterCount(), "Method parameter count must be equal!");
-
-            return IntStream.range(0, first.getParameterCount()) //
-                    .mapToObj(index -> ParameterOverrideCriteria.of(new MethodParameter(first, index),
-                            new MethodParameter(second, index)));
-        }
-
-        /**
-         * Criterion to represent {@link MethodParameter}s from a base method and its declared (overridden) method. Method
-         * parameters indexes are correlated so {@link ParameterOverrideCriteria} applies only to methods with same
-         * parameter count.
-         */
-        static class ParameterOverrideCriteria {
-
-            private final MethodParameter base;
-            private final MethodParameter declared;
-
-            private ParameterOverrideCriteria(MethodParameter base, MethodParameter declared) {
-                this.base = base;
-                this.declared = declared;
-            }
-
-            public static ParameterOverrideCriteria of(MethodParameter base, MethodParameter declared) {
-                return new ParameterOverrideCriteria(base, declared);
-            }
-
-            public MethodParameter getBase() {
-                return base;
-            }
-
-            public MethodParameter getDeclared() {
-                return declared;
-            }
-
-            /**
-             * @return base method parameter type.
-             */
-            public Class<?> getBaseType() {
-                return base.getParameterType();
-            }
-
-            /**
-             * @return generic base method parameter type.
-             */
-            public Type getGenericBaseType() {
-                return base.getGenericParameterType();
-            }
-
-            /**
-             * @return declared method parameter type.
-             */
-            public Class<?> getDeclaredType() {
-                return declared.getParameterType();
-            }
-
-            public boolean isAssignableFromDeclared() {
-                return getBaseType().isAssignableFrom(getDeclaredType());
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
deleted file mode 100644
index 5a8cb6633e..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryCollectingQueryCreationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.impl.repository;
-
-
-import org.springframework.data.repository.core.support.QueryCreationListener;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.5.0
- */
-public class QueryCollectingQueryCreationListener implements QueryCreationListener<RepositoryQuery> {
-
-    private final List<QueryMethod> queryMethods = new ArrayList<>();
-
-    @Override
-    public void onCreation(RepositoryQuery query) {
-        this.queryMethods.add(query.getQueryMethod());
-    }
-
-    public List<QueryMethod> getQueryMethods() {
-        return queryMethods;
-    }
-}
diff --git a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java b/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
deleted file mode 100644
index ec5cda6fae..0000000000
--- a/integration/spring-data/2.7/src/main/java/com/blazebit/persistence/spring/data/impl/repository/QueryExecutionResultHandler.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2014-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.impl.repository;
-
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.repository.util.NullableWrapper;
-import org.springframework.data.repository.util.QueryExecutionConverters;
-import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Simple domain service to convert query results into a dedicated type.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Jens Schauder
- */
-class QueryExecutionResultHandler {
-
-	private static final TypeDescriptor WRAPPER_TYPE = TypeDescriptor.valueOf(NullableWrapper.class);
-
-	private final GenericConversionService conversionService;
-
-	private final Object mutex = new Object();
-
-	// concurrent access guarded by mutex.
-	private Map<Method, ReturnTypeDescriptor> descriptorCache = Collections.emptyMap();
-
-	/**
-	 * Creates a new {@link QueryExecutionResultHandler}.
-	 */
-	public QueryExecutionResultHandler(GenericConversionService conversionService) {
-		this.conversionService = conversionService;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to match the return type of the given method.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param method must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public Object postProcessInvocationResult(@Nullable Object result, Method method) {
-
-		if (!processingRequired(result, method.getReturnType())) {
-			return result;
-		}
-
-		ReturnTypeDescriptor descriptor = getOrCreateReturnTypeDescriptor(method);
-
-		return postProcessInvocationResult(result, 0, descriptor);
-	}
-
-	private ReturnTypeDescriptor getOrCreateReturnTypeDescriptor(Method method) {
-
-		Map<Method, ReturnTypeDescriptor> descriptorCache = this.descriptorCache;
-		ReturnTypeDescriptor descriptor = descriptorCache.get(method);
-
-		if (descriptor == null) {
-
-			descriptor = ReturnTypeDescriptor.of(method);
-
-			Map<Method, ReturnTypeDescriptor> updatedDescriptorCache;
-
-			if (descriptorCache.isEmpty()) {
-				updatedDescriptorCache = Collections.singletonMap(method, descriptor);
-			} else {
-				updatedDescriptorCache = new HashMap<>(descriptorCache.size() + 1, 1);
-				updatedDescriptorCache.putAll(descriptorCache);
-				updatedDescriptorCache.put(method, descriptor);
-
-			}
-
-			synchronized (mutex) {
-				this.descriptorCache = updatedDescriptorCache;
-			}
-		}
-
-		return descriptor;
-	}
-
-	/**
-	 * Post-processes the given result of a query invocation to the given type.
-	 *
-	 * @param result can be {@literal null}.
-	 * @param nestingLevel
-	 * @param descriptor must not be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, ReturnTypeDescriptor descriptor) {
-
-		TypeDescriptor returnTypeDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel);
-
-		if (returnTypeDescriptor == null) {
-			return result;
-		}
-
-		Class<?> expectedReturnType = returnTypeDescriptor.getType();
-
-		result = unwrapOptional(result);
-
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
-
-			// For a wrapper type, try nested resolution first
-			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);
-
-			if (conversionRequired(WRAPPER_TYPE, returnTypeDescriptor)) {
-				return conversionService.convert(new NullableWrapper(result), returnTypeDescriptor);
-			}
-
-			if (result != null) {
-
-				TypeDescriptor source = TypeDescriptor.valueOf(result.getClass());
-
-				if (conversionRequired(source, returnTypeDescriptor)) {
-					return conversionService.convert(result, returnTypeDescriptor);
-				}
-			}
-		}
-
-		if (result != null) {
-
-			if (ReactiveWrapperConverters.supports(expectedReturnType)) {
-				return ReactiveWrapperConverters.toWrapper(result, expectedReturnType);
-			}
-
-			if (result instanceof Collection<?>) {
-
-				TypeDescriptor elementDescriptor = descriptor.getReturnTypeDescriptor(nestingLevel + 1);
-				boolean requiresConversion = requiresConversion((Collection<?>) result, expectedReturnType, elementDescriptor);
-
-				if (!requiresConversion) {
-					return result;
-				}
-			}
-
-			TypeDescriptor resultDescriptor = TypeDescriptor.forObject(result);
-			return conversionService.canConvert(resultDescriptor, returnTypeDescriptor)
-					? conversionService.convert(result, returnTypeDescriptor)
-					: result;
-		}
-
-		return Map.class.equals(expectedReturnType) //
-				? CollectionFactory.createMap(expectedReturnType, 0) //
-				: null;
-
-	}
-	private boolean requiresConversion(Collection<?> collection, Class<?> expectedReturnType,
-			@Nullable TypeDescriptor elementDescriptor) {
-
-		if (Streamable.class.isAssignableFrom(expectedReturnType) || !expectedReturnType.isInstance(collection)) {
-			return true;
-		}
-
-		if (elementDescriptor == null || !Iterable.class.isAssignableFrom(expectedReturnType)) {
-			return false;
-		}
-
-		Class<?> type = elementDescriptor.getType();
-
-		for (Object o : collection) {
-
-			if (!type.isInstance(o)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether the configured {@link ConversionService} can convert between the given {@link TypeDescriptor}s and
-	 * the conversion will not be a no-op.
-	 *
-	 * @param source
-	 * @param target
-	 * @return
-	 */
-	private boolean conversionRequired(TypeDescriptor source, TypeDescriptor target) {
-
-		return conversionService.canConvert(source, target) //
-				&& !conversionService.canBypassConvert(source, target);
-	}
-
-	/**
-	 * Unwraps the given value if it's a JDK 8 {@link Optional}.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Object unwrapOptional(@Nullable Object source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return Optional.class.isInstance(source) //
-				? Optional.class.cast(source).orElse(null) //
-				: source;
-	}
-
-	/**
-	 * Returns whether we have to process the given source object in the first place.
-	 *
-	 * @param source can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @return
-	 */
-	private static boolean processingRequired(@Nullable Object source, Class<?> targetType) {
-
-		return !targetType.isInstance(source) //
-				|| source == null //
-				|| Collection.class.isInstance(source);
-	}
-
-	/**
-	 * Value object capturing {@link MethodParameter} and {@link TypeDescriptor}s for top and nested levels.
-	 */
-	static class ReturnTypeDescriptor {
-
-		private final MethodParameter methodParameter;
-		private final TypeDescriptor typeDescriptor;
-		private final @Nullable TypeDescriptor nestedTypeDescriptor;
-
-		private ReturnTypeDescriptor(Method method) {
-			this.methodParameter = new MethodParameter(method, -1);
-			this.typeDescriptor = TypeDescriptor.nested(this.methodParameter, 0);
-			this.nestedTypeDescriptor = TypeDescriptor.nested(this.methodParameter, 1);
-		}
-
-		/**
-		 * Create a {@link ReturnTypeDescriptor} from a {@link Method}.
-		 *
-		 * @param method
-		 * @return
-		 */
-		public static ReturnTypeDescriptor of(Method method) {
-			return new ReturnTypeDescriptor(method);
-		}
-
-		/**
-		 * Return the {@link TypeDescriptor} for a nested type declared within the method parameter described by
-		 * {@code nestingLevel} .
-		 *
-		 * @param nestingLevel the nesting level. {@code 0} is the first level, {@code 1} the next inner one.
-		 * @return the {@link TypeDescriptor} or {@literal null} if it could not be obtained.
-		 * @see TypeDescriptor#nested(MethodParameter, int)
-		 */
-		@Nullable
-		public TypeDescriptor getReturnTypeDescriptor(int nestingLevel) {
-
-			// optimizing for nesting level 0 and 1 (Optional<T>, List<T>)
-			// nesting level 2 (Optional<List<T>>) uses the slow path.
-
-			switch (nestingLevel) {
-				case 0:
-					return typeDescriptor;
-				case 1:
-					return nestedTypeDescriptor;
-				default:
-					return TypeDescriptor.nested(this.methodParameter, nestingLevel);
-			}
-		}
-	}
-}
diff --git a/integration/spring-data/3.1/pom.xml b/integration/spring-data/3.1/pom.xml
index 60b92da4e9..7b7c4261b3 100644
--- a/integration/spring-data/3.1/pom.xml
+++ b/integration/spring-data/3.1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -62,20 +62,19 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -92,12 +91,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -115,53 +114,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/integration/spring-data/3.1/src/main/java/module-info.java b/integration/spring-data/3.1/src/main/java/module-info.java
new file mode 100644
index 0000000000..0a2d362333
--- /dev/null
+++ b/integration/spring-data/3.1/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data.impl {
+	requires transitive com.blazebit.persistence.integration.spring.data;
+	requires spring.data.commons;
+	requires com.blazebit.persistence.view;
+	requires jakarta.persistence;
+	requires spring.expression;
+	requires spring.core;
+	requires com.blazebit.persistence.core.parser;
+	requires spring.aop;
+	requires spring.beans;
+	requires spring.tx;
+	exports com.blazebit.persistence.spring.data.impl.query;
+	exports com.blazebit.persistence.spring.data.impl.repository;
+}
\ No newline at end of file
diff --git a/integration/spring-data/3.3/pom.xml b/integration/spring-data/3.3/pom.xml
index 51b4c7c816..e5beefbb2e 100644
--- a/integration/spring-data/3.3/pom.xml
+++ b/integration/spring-data/3.3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -62,20 +62,19 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -92,12 +91,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -115,53 +114,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        exports com.blazebit.persistence.spring.data.impl.query;
-                                        exports com.blazebit.persistence.spring.data.impl.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/integration/spring-data/3.3/src/main/java/module-info.java b/integration/spring-data/3.3/src/main/java/module-info.java
new file mode 100644
index 0000000000..0a2d362333
--- /dev/null
+++ b/integration/spring-data/3.3/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data.impl {
+	requires transitive com.blazebit.persistence.integration.spring.data;
+	requires spring.data.commons;
+	requires com.blazebit.persistence.view;
+	requires jakarta.persistence;
+	requires spring.expression;
+	requires spring.core;
+	requires com.blazebit.persistence.core.parser;
+	requires spring.aop;
+	requires spring.beans;
+	requires spring.tx;
+	exports com.blazebit.persistence.spring.data.impl.query;
+	exports com.blazebit.persistence.spring.data.impl.repository;
+}
\ No newline at end of file
diff --git a/integration/spring-data/asm-debug-all/pom.xml b/integration/spring-data/asm-debug-all/pom.xml
deleted file mode 100644
index c793f24c3d..0000000000
--- a/integration/spring-data/asm-debug-all/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.ow2.asm</groupId>
-    <artifactId>asm-debug-all</artifactId>
-    <version>CUSTOM</version>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>DISABLE_FOR_EXCLUDE_PLUGIN_DEPENDENCY_WORKAROUND</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/base-3.1/pom.xml b/integration/spring-data/base-3.1/pom.xml
index b50ab9ca66..1cbcb8796f 100644
--- a/integration/spring-data/base-3.1/pom.xml
+++ b/integration/spring-data/base-3.1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,20 +34,19 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -59,12 +58,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -89,38 +88,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.context;
-                                        requires transitive spring.data.jpa;
-                                        requires transitive com.blazebit.persistence.criteria;
-                                        exports com.blazebit.persistence.spring.data.annotation;
-                                        exports com.blazebit.persistence.spring.data.base;
-                                        exports com.blazebit.persistence.spring.data.base.query;
-                                        exports com.blazebit.persistence.spring.data.base.repository;
-                                        exports com.blazebit.persistence.spring.data.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
 </project>
diff --git a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
index 99fc86b420..01dc14186b 100644
--- a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
@@ -40,9 +40,6 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.FixedJpaCountQueryCreator;
-import org.springframework.data.jpa.repository.query.FixedJpaQueryCreator;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
 import org.springframework.data.jpa.repository.query.JpaEntityGraph;
 import org.springframework.data.jpa.repository.query.PartTreeJpaQuery;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
@@ -55,7 +52,6 @@
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
similarity index 89%
rename from integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
rename to integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
index b7e873a8b8..f85b523558 100644
--- a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
@@ -3,9 +3,8 @@
  * Copyright Blazebit
  */
 
-package org.springframework.data.jpa.repository.query;
+package com.blazebit.persistence.spring.data.base.query;
 
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.parser.PartTree;
 
diff --git a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
similarity index 97%
rename from integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
rename to integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
index 1d973d6289..e438103a11 100644
--- a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.springframework.data.jpa.repository.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+package com.blazebit.persistence.spring.data.base.query;
 
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.query.JpaQueryCreator;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
@@ -36,7 +35,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import static org.springframework.data.jpa.repository.query.QueryUtils.toExpressionRecursively;
 import static org.springframework.data.repository.query.parser.Part.Type.NOT_CONTAINING;
 import static org.springframework.data.repository.query.parser.Part.Type.NOT_LIKE;
 
@@ -112,7 +110,7 @@ protected final CriteriaQuery<Object> complete(Predicate predicate, Sort sort) {
      */
     protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort, CriteriaQuery<Object> query,
                                              CriteriaBuilder builder, Root<?> root) {
-        CriteriaQuery<Object> select = this.query.select(root).orderBy(QueryUtils.toOrders(sort, root, builder));
+        CriteriaQuery<Object> select = this.query.select(root).orderBy( QueryUtils.toOrders( sort, root, builder));
         return predicate == null ? select : select.where(predicate);
     }
 
@@ -288,7 +286,7 @@ private Expression<? extends Comparable> getComparablePath(Root<?> root, Part pa
         }
 
         private <T> Expression<T> getTypedPath(Root<?> root, Part part) {
-            return toExpressionRecursively(root, part.getProperty());
+            return QueryUtils.toExpressionRecursively( root, part.getProperty());
         }
 
         private <T> Expression<T> traversePath(Path<?> root, PropertyPath path) {
diff --git a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java
new file mode 100644
index 0000000000..54e6457052
--- /dev/null
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java
@@ -0,0 +1,1009 @@
+/*
+ * Copyright 2008-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.blazebit.persistence.spring.data.base.query;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Member;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Fetch;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.jpa.domain.JpaSort.JpaOrder;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.util.Streamable;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ELEMENT_COLLECTION;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.MANY_TO_MANY;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.MANY_TO_ONE;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_MANY;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_ONE;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import static java.util.regex.Pattern.DOTALL;
+import static java.util.regex.Pattern.MULTILINE;
+import static java.util.regex.Pattern.compile;
+
+/**
+ * Simple utility class to create JPA queries using the default implementation of a custom parser.
+ *
+ * @author Oliver Gierke
+ * @author Kevin Raymond
+ * @author Thomas Darimont
+ * @author Komi Innocent
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Sébastien Péralta
+ * @author Jens Schauder
+ * @author Nils Borrmann
+ * @author Reda.Housni-Alaoui
+ * @author Florian Lüdiger
+ * @author Grégoire Druant
+ * @author Mohammad Hewedy
+ * @author Andriy Redko
+ * @author Peter Großmann
+ * @author Greg Turnquist
+ * @author Diego Krupitza
+ * @author Jędrzej Biedrzycki
+ * @author Darin Manica
+ * @author Simon Paradies
+ * @author Vladislav Yukharin
+ * @author Chris Fraser
+ * @author Donghun Shin
+ * @author Pranav HS
+ * @author Eduard Dudar
+ * @author Yanming Zhou
+ */
+public abstract class QueryUtils {
+
+	public static final String COUNT_QUERY_STRING = "select count(%s) from %s x";
+	public static final String DELETE_ALL_QUERY_STRING = "delete from %s x";
+	public static final String DELETE_ALL_QUERY_BY_ID_STRING = "delete from %s x where %s in :ids";
+
+	// Used Regex/Unicode categories (see https://www.unicode.org/reports/tr18/#General_Category_Property):
+	// Z Separator
+	// Cc Control
+	// Cf Format
+	// Punct Punctuation
+	private static final String IDENTIFIER = "[._$[\\P{Z}&&\\P{Cc}&&\\P{Cf}&&\\P{Punct}]]+";
+	static final String COLON_NO_DOUBLE_COLON = "(?<![:\\\\]):";
+	static final String IDENTIFIER_GROUP = String.format("(%s)", IDENTIFIER);
+
+	private static final String COUNT_REPLACEMENT_TEMPLATE = "select count(%s) $5$6$7";
+	private static final String SIMPLE_COUNT_VALUE = "$2";
+	private static final String COMPLEX_COUNT_VALUE = "$3 $6";
+	private static final String COMPLEX_COUNT_LAST_VALUE = "$6";
+	private static final Pattern ORDER_BY_PART = Pattern.compile("(?iu)\\s+order\\s+by\\s+.*", CASE_INSENSITIVE | DOTALL);
+
+	private static final Pattern ALIAS_MATCH;
+	private static final Pattern COUNT_MATCH;
+	private static final Pattern STARTS_WITH_PAREN = Pattern.compile("^\\s*\\(");
+	private static final Pattern PARENS_TO_REMOVE = Pattern.compile("(\\(.*\\bfrom\\b[^)]+\\))",
+			CASE_INSENSITIVE | DOTALL | MULTILINE);
+	private static final Pattern PROJECTION_CLAUSE = Pattern.compile("select\\s+(?:distinct\\s+)?(.+)\\s+from",
+			Pattern.CASE_INSENSITIVE);
+
+	private static final Pattern NO_DIGITS = Pattern.compile("\\D+");
+
+	private static final String JOIN = "join\\s+(fetch\\s+)?" + IDENTIFIER + "\\s+(as\\s+)?" + IDENTIFIER_GROUP;
+	private static final Pattern JOIN_PATTERN = Pattern.compile(JOIN, Pattern.CASE_INSENSITIVE);
+
+	private static final String EQUALS_CONDITION_STRING = "%s.%s = :%s";
+	private static final Pattern ORDER_BY = Pattern.compile("(order\\s+by\\s+)", CASE_INSENSITIVE);
+	private static final Pattern ORDER_BY_IN_WINDOW_OR_SUBSELECT = Pattern
+			.compile("\\([\\s\\S]*order\\s+by\\s[\\s\\S]*\\)", CASE_INSENSITIVE);
+
+	private static final Pattern NAMED_PARAMETER = Pattern.compile(COLON_NO_DOUBLE_COLON + IDENTIFIER + "|#" + IDENTIFIER,
+			CASE_INSENSITIVE);
+
+	private static final Pattern CONSTRUCTOR_EXPRESSION;
+
+	private static final Map<PersistentAttributeType, Class<? extends Annotation>> ASSOCIATION_TYPES;
+
+	private static final int QUERY_JOIN_ALIAS_GROUP_INDEX = 3;
+	private static final int VARIABLE_NAME_GROUP_INDEX = 4;
+	private static final int COMPLEX_COUNT_FIRST_INDEX = 3;
+
+	private static final Pattern PUNCTATION_PATTERN = Pattern.compile(".*((?![._])[\\p{Punct}|\\s])");
+	private static final Pattern FUNCTION_PATTERN;
+	private static final Pattern FIELD_ALIAS_PATTERN;
+
+	private static final String UNSAFE_PROPERTY_REFERENCE = "Sort expression '%s' must only contain property references or "
+			+ "aliases used in the select clause; If you really want to use something other than that for sorting, please use "
+			+ "JpaSort.unsafe(…)";
+
+	static {
+
+		StringBuilder builder = new StringBuilder();
+		builder.append("(?<=\\bfrom)"); // from as starting delimiter
+		builder.append("(?:\\s)+"); // at least one space separating
+		builder.append(IDENTIFIER_GROUP); // Entity name, can be qualified (any
+		builder.append("(?:\\sas)*"); // exclude possible "as" keyword
+		builder.append("(?:\\s)+"); // at least one space separating
+		builder.append("(?!(?:where|group\\s*by|order\\s*by))(\\w+)"); // the actual alias
+
+		ALIAS_MATCH = compile(builder.toString(), CASE_INSENSITIVE);
+
+		builder = new StringBuilder();
+		builder.append("\\s*");
+		builder.append("(select\\s+((distinct)?((?s).+?)?)\\s+)?(from\\s+");
+		builder.append(IDENTIFIER);
+		builder.append("(?:\\s+as)?\\s*)");
+		builder.append(IDENTIFIER_GROUP);
+		builder.append("(.*)");
+
+		COUNT_MATCH = compile(builder.toString(), CASE_INSENSITIVE | DOTALL);
+
+		Map<PersistentAttributeType, Class<? extends Annotation>> persistentAttributeTypes = new HashMap<>();
+		persistentAttributeTypes.put(ONE_TO_ONE, OneToOne.class);
+		persistentAttributeTypes.put(ONE_TO_MANY, null);
+		persistentAttributeTypes.put(MANY_TO_ONE, ManyToOne.class);
+		persistentAttributeTypes.put(MANY_TO_MANY, null);
+		persistentAttributeTypes.put(ELEMENT_COLLECTION, null);
+
+		ASSOCIATION_TYPES = Collections.unmodifiableMap(persistentAttributeTypes);
+
+		builder = new StringBuilder();
+		builder.append("select");
+		builder.append("\\s+"); // at least one space separating
+		builder.append("(.*\\s+)?"); // anything in between (e.g. distinct) at least one space separating
+		builder.append("new");
+		builder.append("\\s+"); // at least one space separating
+		builder.append(IDENTIFIER);
+		builder.append("\\s*"); // zero to unlimited space separating
+		builder.append("\\(");
+		builder.append(".*");
+		builder.append("\\)");
+
+		CONSTRUCTOR_EXPRESSION = compile(builder.toString(), CASE_INSENSITIVE + DOTALL);
+
+		builder = new StringBuilder();
+		// any function call including parameters within the brackets
+		builder.append("\\w+\\s*\\([\\w\\.,\\s'=:;\\\\?]+\\)");
+		// the potential alias
+		builder.append("\\s+[as|AS]+\\s+(([\\w\\.]+))");
+
+		FUNCTION_PATTERN = compile(builder.toString());
+
+		builder = new StringBuilder();
+		builder.append("\\s+"); // at least one space
+		builder.append("[^\\s\\(\\)]+"); // No white char no bracket
+		builder.append("\\s+[as|AS]+\\s+(([\\w\\.]+))"); // the potential alias
+
+		FIELD_ALIAS_PATTERN = compile(builder.toString());
+
+	}
+
+	/**
+	 * Private constructor to prevent instantiation.
+	 */
+	private QueryUtils() {
+
+	}
+
+	/**
+	 * Returns the query string to execute an exists query for the given id attributes.
+	 *
+	 * @param entityName the name of the entity to create the query for, must not be {@literal null}.
+	 * @param countQueryPlaceHolder the placeholder for the count clause, must not be {@literal null}.
+	 * @param idAttributes the id attributes for the entity, must not be {@literal null}.
+	 */
+	public static String getExistsQueryString(String entityName, String countQueryPlaceHolder,
+			Iterable<String> idAttributes) {
+
+		String whereClause = Streamable.of(idAttributes).stream() //
+				.map(idAttribute -> String.format(EQUALS_CONDITION_STRING, "x", idAttribute, idAttribute)) //
+				.collect(Collectors.joining(" AND ", " WHERE ", ""));
+
+		return String.format(COUNT_QUERY_STRING, countQueryPlaceHolder, entityName) + whereClause;
+	}
+
+	/**
+	 * Returns the query string for the given class name.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @param entityName must not be {@literal null}.
+	 * @return the template with placeholders replaced by the {@literal entityName}. Guaranteed to be not {@literal null}.
+	 */
+	public static String getQueryString(String template, String entityName) {
+
+		Assert.hasText(entityName, "Entity name must not be null or empty");
+
+		return String.format(template, entityName);
+	}
+
+	/**
+	 * Adds {@literal order by} clause to the JPQL query. Uses the first alias to bind the sorting property to.
+	 *
+	 * @param query the query string to which sorting is applied
+	 * @param sort the sort specification to apply.
+	 * @return the modified query string.
+	 */
+	public static String applySorting(String query, Sort sort) {
+		return applySorting(query, sort, detectAlias(query));
+	}
+
+	/**
+	 * Adds {@literal order by} clause to the JPQL query.
+	 *
+	 * @param query the query string to which sorting is applied. Must not be {@literal null} or empty.
+	 * @param sort the sort specification to apply.
+	 * @param alias the alias to be used in the order by clause. May be {@literal null} or empty.
+	 * @return the modified query string.
+	 */
+	public static String applySorting(String query, Sort sort, @Nullable String alias) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		if (sort.isUnsorted()) {
+			return query;
+		}
+
+		StringBuilder builder = new StringBuilder(query);
+
+		if (hasOrderByClause(query)) {
+			builder.append(", ");
+		} else {
+			builder.append(" order by ");
+		}
+
+		Set<String> joinAliases = getOuterJoinAliases(query);
+		Set<String> selectionAliases = getFunctionAliases(query);
+		selectionAliases.addAll(getFieldAliases(query));
+
+		for (Order order : sort) {
+			builder.append(getOrderClause(joinAliases, selectionAliases, alias, order)).append(", ");
+		}
+
+		builder.delete(builder.length() - 2, builder.length());
+
+		return builder.toString();
+	}
+
+	/**
+	 * Returns {@code true} if the query has {@code order by} clause. The query has {@code order by} clause if there is an
+	 * {@code order by} which is not part of window clause.
+	 *
+	 * @param query the analysed query string
+	 * @return {@code true} if the query has {@code order by} clause, {@code false} otherwise
+	 */
+	private static boolean hasOrderByClause(String query) {
+		return countOccurrences(ORDER_BY, query) > countOccurrences(ORDER_BY_IN_WINDOW_OR_SUBSELECT, query);
+	}
+
+	/**
+	 * Counts the number of occurrences of the pattern in the string
+	 *
+	 * @param pattern regex with a group to match
+	 * @param string analysed string
+	 * @return the number of occurrences of the pattern in the string
+	 */
+	private static int countOccurrences(Pattern pattern, String string) {
+
+		Matcher matcher = pattern.matcher(string);
+
+		int occurrences = 0;
+		while (matcher.find()) {
+			occurrences++;
+		}
+		return occurrences;
+	}
+
+	/**
+	 * Returns the order clause for the given {@link Order}. Will prefix the clause with the given alias if the referenced
+	 * property refers to a join alias, i.e. starts with {@code $alias.}.
+	 *
+	 * @param joinAliases the join aliases of the original query. Must not be {@literal null}.
+	 * @param alias the alias for the root entity. May be {@literal null}.
+	 * @param order the order object to build the clause for. Must not be {@literal null}.
+	 * @return a String containing an order clause. Guaranteed to be not {@literal null}.
+	 */
+	private static String getOrderClause(Set<String> joinAliases, Set<String> selectionAlias, @Nullable String alias,
+			Order order) {
+
+		String property = order.getProperty();
+
+		checkSortExpression(order);
+
+		if (selectionAlias.contains(property)) {
+
+			return String.format("%s %s", //
+					order.isIgnoreCase() ? String.format("lower(%s)", property) : property, //
+					toJpaDirection(order));
+		}
+
+		boolean qualifyReference = !property.contains("("); // ( indicates a function
+
+		for (String joinAlias : joinAliases) {
+
+			if (property.startsWith(joinAlias.concat("."))) {
+
+				qualifyReference = false;
+				break;
+			}
+		}
+
+		String reference = qualifyReference && StringUtils.hasText(alias) ? String.format("%s.%s", alias, property)
+				: property;
+		String wrapped = order.isIgnoreCase() ? String.format("lower(%s)", reference) : reference;
+
+		return String.format("%s %s", wrapped, toJpaDirection(order));
+	}
+
+	/**
+	 * Returns the aliases used for {@code left (outer) join}s.
+	 *
+	 * @param query a query string to extract the aliases of joins from. Must not be {@literal null}.
+	 * @return a {@literal Set} of aliases used in the query. Guaranteed to be not {@literal null}.
+	 */
+	static Set<String> getOuterJoinAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = JOIN_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+
+			String alias = matcher.group(QUERY_JOIN_ALIAS_GROUP_INDEX);
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Returns the aliases used for fields in the query.
+	 *
+	 * @param query a {@literal String} containing a query. Must not be {@literal null}.
+	 * @return a {@literal Set} containing all found aliases. Guaranteed to be not {@literal null}.
+	 */
+	private static Set<String> getFieldAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = FIELD_ALIAS_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+			String alias = matcher.group(1);
+
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the aliases used for aggregate functions like {@code SUM, COUNT, ...}.
+	 *
+	 * @param query a {@literal String} containing a query. Must not be {@literal null}.
+	 * @return a {@literal Set} containing all found aliases. Guaranteed to be not {@literal null}.
+	 */
+	static Set<String> getFunctionAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = FUNCTION_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+
+			String alias = matcher.group(1);
+
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+
+		return result;
+	}
+
+	private static String toJpaDirection(Order order) {
+		return order.getDirection().name().toLowerCase(Locale.US);
+	}
+
+	/**
+	 * Resolves the alias for the entity to be retrieved from the given JPA query.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return Might return {@literal null}.
+	 * @deprecated use {@link DeclaredQuery#getAlias()} instead.
+	 */
+	@Nullable
+	@Deprecated
+	public static String detectAlias(String query) {
+
+		String alias = null;
+		Matcher matcher = ALIAS_MATCH.matcher(removeSubqueries(query));
+		while (matcher.find()) {
+			alias = matcher.group(2);
+		}
+		return alias;
+	}
+
+	/**
+	 * Remove subqueries from the query, in order to identify the correct alias in order by clauses. If the entire query
+	 * is surrounded by parenthesis, the outermost parenthesis are not removed.
+	 *
+	 * @param query
+	 * @return query with all subqueries removed.
+	 */
+	static String removeSubqueries(String query) {
+
+		if (!StringUtils.hasText(query)) {
+			return query;
+		}
+
+		List<Integer> opens = new ArrayList<>();
+		List<Integer> closes = new ArrayList<>();
+		List<Boolean> closeMatches = new ArrayList<>();
+
+		for (int i = 0; i < query.length(); i++) {
+
+			char c = query.charAt(i);
+			if (c == '(') {
+				opens.add(i);
+			} else if (c == ')') {
+				closes.add(i);
+				closeMatches.add(Boolean.FALSE);
+			}
+		}
+
+		StringBuilder sb = new StringBuilder(query);
+		boolean startsWithParen = STARTS_WITH_PAREN.matcher(query).find();
+		for (int i = opens.size() - 1; i >= (startsWithParen ? 1 : 0); i--) {
+
+			Integer open = opens.get(i);
+			Integer close = findClose(open, closes, closeMatches) + 1;
+
+			if (close > open) {
+
+				String subquery = sb.substring(open, close);
+				Matcher matcher = PARENS_TO_REMOVE.matcher(subquery);
+				if (matcher.find()) {
+					sb.replace(open, close, new String(new char[close - open]).replace('\0', ' '));
+				}
+			}
+		}
+
+		return sb.toString();
+	}
+
+	private static Integer findClose(final Integer open, final List<Integer> closes, final List<Boolean> closeMatches) {
+
+		for (int i = 0; i < closes.size(); i++) {
+
+			int close = closes.get(i);
+			if (close > open && !closeMatches.get(i)) {
+				closeMatches.set(i, Boolean.TRUE);
+				return close;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Creates a where-clause referencing the given entities and appends it to the given query string. Binds the given
+	 * entities to the query.
+	 *
+	 * @param <T> type of the entities.
+	 * @param queryString must not be {@literal null}.
+	 * @param entities must not be {@literal null}.
+	 * @param entityManager must not be {@literal null}.
+	 * @return Guaranteed to be not {@literal null}.
+	 */
+
+	public static <T> Query applyAndBind(String queryString, Iterable<T> entities, EntityManager entityManager) {
+
+		Assert.notNull(queryString, "Querystring must not be null");
+		Assert.notNull(entities, "Iterable of entities must not be null");
+		Assert.notNull(entityManager, "EntityManager must not be null");
+
+		Iterator<T> iterator = entities.iterator();
+
+		if (!iterator.hasNext()) {
+			return entityManager.createQuery(queryString);
+		}
+
+		String alias = detectAlias(queryString);
+		StringBuilder builder = new StringBuilder(queryString);
+		builder.append(" where");
+
+		int i = 0;
+
+		while (iterator.hasNext()) {
+
+			iterator.next();
+
+			builder.append(String.format(" %s = ?%d", alias, ++i));
+
+			if (iterator.hasNext()) {
+				builder.append(" or");
+			}
+		}
+
+		Query query = entityManager.createQuery(builder.toString());
+
+		iterator = entities.iterator();
+		i = 0;
+
+		while (iterator.hasNext()) {
+			query.setParameter(++i, iterator.next());
+		}
+
+		return query;
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null} or empty.
+	 * @return Guaranteed to be not {@literal null}.
+	 * @deprecated use {@link DeclaredQuery#deriveCountQuery(String)} instead.
+	 */
+	@Deprecated
+	public static String createCountQueryFor(String originalQuery) {
+		return createCountQueryFor(originalQuery, null);
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null}.
+	 * @param countProjection may be {@literal null}.
+	 * @return a query String to be used a count query for pagination. Guaranteed to be not {@literal null}.
+	 * @since 1.6
+	 * @deprecated use {@link DeclaredQuery#deriveCountQuery(String)} instead.
+	 */
+	@Deprecated
+	public static String createCountQueryFor(String originalQuery, @Nullable String countProjection) {
+		return createCountQueryFor(originalQuery, countProjection, false);
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null}.
+	 * @param countProjection may be {@literal null}.
+	 * @param nativeQuery whether the underlying query is a native query.
+	 * @return a query String to be used a count query for pagination. Guaranteed to be not {@literal null}.
+	 * @since 2.7.8
+	 */
+	static String createCountQueryFor(String originalQuery, @Nullable String countProjection, boolean nativeQuery) {
+
+		Assert.hasText(originalQuery, "OriginalQuery must not be null or empty");
+
+		Matcher matcher = COUNT_MATCH.matcher(originalQuery);
+		String countQuery;
+
+		if (countProjection == null) {
+
+			String variable = matcher.matches() ? matcher.group(VARIABLE_NAME_GROUP_INDEX) : null;
+			boolean useVariable = StringUtils.hasText(variable) //
+					&& !variable.startsWith("new") // select [new com.example.User...
+					&& !variable.startsWith(" new") // select distinct[ new com.example.User...
+					&& !variable.startsWith("count(") // select [count(...
+					&& !variable.contains(",");
+
+			String complexCountValue = matcher.matches() && StringUtils.hasText(matcher.group(COMPLEX_COUNT_FIRST_INDEX))
+					? COMPLEX_COUNT_VALUE
+					: COMPLEX_COUNT_LAST_VALUE;
+
+			String replacement = useVariable ? SIMPLE_COUNT_VALUE : complexCountValue;
+
+			if (variable != null && (nativeQuery && (variable.contains(",") || "*".equals(variable)))) {
+				replacement = "1";
+			} else {
+
+				String alias = QueryUtils.detectAlias(originalQuery);
+				if ("*".equals(variable) && alias != null) {
+					replacement = alias;
+				}
+			}
+
+			countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, replacement));
+		} else {
+			countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, countProjection));
+		}
+
+		return ORDER_BY_PART.matcher(countQuery).replaceFirst("");
+	}
+
+	/**
+	 * Returns whether the given {@link Query} contains named parameters.
+	 *
+	 * @param query Must not be {@literal null}.
+	 * @return whether the given {@link Query} contains named parameters.
+	 */
+	public static boolean hasNamedParameter(Query query) {
+
+		Assert.notNull(query, "Query must not be null");
+
+		for (Parameter<?> parameter : query.getParameters()) {
+
+			String name = parameter.getName();
+
+			// Hibernate 3 specific hack as it returns the index as String for the name.
+			if (name != null && NO_DIGITS.matcher(name).find()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether the given query contains named parameters.
+	 *
+	 * @param query can be {@literal null} or empty.
+	 * @return whether the given query contains named parameters.
+	 */
+	@Deprecated
+	static boolean hasNamedParameter(@Nullable String query) {
+		return StringUtils.hasText(query) && NAMED_PARAMETER.matcher(query).find();
+	}
+
+	/**
+	 * Turns the given {@link Sort} into {@link jakarta.persistence.criteria.Order}s.
+	 *
+	 * @param sort the {@link Sort} instance to be transformed into JPA {@link jakarta.persistence.criteria.Order}s.
+	 * @param from must not be {@literal null}.
+	 * @param cb must not be {@literal null}.
+	 * @return a {@link List} of {@link jakarta.persistence.criteria.Order}s.
+	 */
+	public static List<jakarta.persistence.criteria.Order> toOrders(Sort sort, From<?, ?> from, CriteriaBuilder cb) {
+
+		if (sort.isUnsorted()) {
+			return Collections.emptyList();
+		}
+
+		Assert.notNull(from, "From must not be null");
+		Assert.notNull(cb, "CriteriaBuilder must not be null");
+
+		List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();
+
+		for ( Order order : sort) {
+			orders.add(toJpaOrder(order, from, cb));
+		}
+
+		return orders;
+	}
+
+	/**
+	 * Returns whether the given JPQL query contains a constructor expression.
+	 *
+	 * @param query must not be {@literal null} or empty.
+	 * @return whether the given JPQL query contains a constructor expression.
+	 * @since 1.10
+	 */
+	public static boolean hasConstructorExpression(String query) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		return CONSTRUCTOR_EXPRESSION.matcher(query).find();
+	}
+
+	/**
+	 * Returns the projection part of the query, i.e. everything between {@code select} and {@code from}.
+	 *
+	 * @param query must not be {@literal null} or empty.
+	 * @return the projection part of the query.
+	 * @since 1.10.2
+	 */
+	public static String getProjection(String query) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		Matcher matcher = PROJECTION_CLAUSE.matcher(query);
+		String projection = matcher.find() ? matcher.group(1) : "";
+		return projection.trim();
+	}
+
+	/**
+	 * Creates a criteria API {@link jakarta.persistence.criteria.Order} from the given {@link Order}.
+	 *
+	 * @param order the order to transform into a JPA {@link jakarta.persistence.criteria.Order}
+	 * @param from the {@link From} the {@link Order} expression is based on
+	 * @param cb the {@link CriteriaBuilder} to build the {@link jakarta.persistence.criteria.Order} with
+	 * @return Guaranteed to be not {@literal null}.
+	 */
+	@SuppressWarnings("unchecked")
+	private static jakarta.persistence.criteria.Order toJpaOrder(Order order, From<?, ?> from, CriteriaBuilder cb) {
+
+		PropertyPath property = PropertyPath.from(order.getProperty(), from.getJavaType());
+		Expression<?> expression = toExpressionRecursively(from, property);
+
+		if (order.isIgnoreCase() && String.class.equals(expression.getJavaType())) {
+			Expression<String> upper = cb.lower((Expression<String>) expression);
+			return order.isAscending() ? cb.asc(upper) : cb.desc(upper);
+		} else {
+			return order.isAscending() ? cb.asc(expression) : cb.desc(expression);
+		}
+	}
+
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property) {
+		return toExpressionRecursively(from, property, false);
+	}
+
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property, boolean isForSelection) {
+		return toExpressionRecursively(from, property, isForSelection, false);
+	}
+
+	/**
+	 * Creates an expression with proper inner and left joins by recursively navigating the path
+	 *
+	 * @param from the {@link From}
+	 * @param property the property path
+	 * @param isForSelection is the property navigated for the selection or ordering part of the query?
+	 * @param hasRequiredOuterJoin has a parent already required an outer join?
+	 * @param <T> the type of the expression
+	 * @return the expression
+	 */
+	@SuppressWarnings("unchecked")
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property, boolean isForSelection,
+			boolean hasRequiredOuterJoin) {
+
+		String segment = property.getSegment();
+
+		boolean isLeafProperty = !property.hasNext();
+
+		boolean requiresOuterJoin = requiresOuterJoin(from, property, isForSelection, hasRequiredOuterJoin);
+
+		// if it does not require an outer join and is a leaf, simply get the segment
+		if (!requiresOuterJoin && isLeafProperty) {
+			return from.get(segment);
+		}
+
+		// get or create the join
+		JoinType joinType = requiresOuterJoin ? JoinType.LEFT : JoinType.INNER;
+		Join<?, ?> join = getOrCreateJoin(from, segment, joinType);
+
+		// if it's a leaf, return the join
+		if (isLeafProperty) {
+			return (Expression<T>) join;
+		}
+
+		PropertyPath nextProperty = Objects.requireNonNull(property.next(), "An element of the property path is null");
+
+		// recurse with the next property
+		return toExpressionRecursively(join, nextProperty, isForSelection, requiresOuterJoin);
+	}
+
+	/**
+	 * Checks if this attribute requires an outer join. This is the case e.g. if it hadn't already been fetched with an
+	 * inner join and if it's an optional association, and if previous paths has already required outer joins. It also
+	 * ensures outer joins are used even when Hibernate defaults to inner joins (HHH-12712 and HHH-12999).
+	 *
+	 * @param from the {@link From} to check for fetches.
+	 * @param property the property path
+	 * @param isForSelection is the property navigated for the selection or ordering part of the query? if true, we need
+	 *          to generate an explicit outer join in order to prevent Hibernate to use an inner join instead. see
+	 *          https://hibernate.atlassian.net/browse/HHH-12999
+	 * @param hasRequiredOuterJoin has a parent already required an outer join?
+	 * @return whether an outer join is to be used for integrating this attribute in a query.
+	 */
+	private static boolean requiresOuterJoin(From<?, ?> from, PropertyPath property, boolean isForSelection,
+			boolean hasRequiredOuterJoin) {
+
+		// already inner joined so outer join is useless
+		if (isAlreadyInnerJoined(from, property.getSegment())) {
+			return false;
+		}
+
+		Bindable<?> model = from.getModel();
+		ManagedType<?> managedType = getManagedTypeForModel(model);
+		Bindable<?> propertyPathModel = getModelForPath(property, managedType, from);
+
+		// is the attribute of Collection type?
+		boolean isPluralAttribute = model instanceof PluralAttribute;
+
+		if (propertyPathModel == null && isPluralAttribute) {
+			return true;
+		}
+
+		if (!(propertyPathModel instanceof Attribute<?, ?> attribute)) {
+			return false;
+		}
+
+		// not a persistent attribute type association (@OneToOne, @ManyToOne)
+		if (!ASSOCIATION_TYPES.containsKey(attribute.getPersistentAttributeType())) {
+			return false;
+		}
+
+		boolean isCollection = attribute.isCollection();
+		// if this path is an optional one to one attribute navigated from the not owning side we also need an
+		// explicit outer join to avoid https://hibernate.atlassian.net/browse/HHH-12712
+		// and https://github.com/eclipse-ee4j/jpa-api/issues/170
+		boolean isInverseOptionalOneToOne = PersistentAttributeType.ONE_TO_ONE == attribute.getPersistentAttributeType()
+				&& StringUtils.hasText(getAnnotationProperty(attribute, "mappedBy", ""));
+
+		boolean isLeafProperty = !property.hasNext();
+		if (isLeafProperty && !isForSelection && !isCollection && !isInverseOptionalOneToOne && !hasRequiredOuterJoin) {
+			return false;
+		}
+
+		return hasRequiredOuterJoin || getAnnotationProperty(attribute, "optional", true);
+	}
+
+	@Nullable
+	private static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String propertyName, T defaultValue) {
+
+		Class<? extends Annotation> associationAnnotation = ASSOCIATION_TYPES.get(attribute.getPersistentAttributeType());
+
+		if (associationAnnotation == null) {
+			return defaultValue;
+		}
+
+		Member member = attribute.getJavaMember();
+
+		if (!(member instanceof AnnotatedElement annotatedMember)) {
+			return defaultValue;
+		}
+
+		Annotation annotation = AnnotationUtils.getAnnotation(annotatedMember, associationAnnotation);
+		return annotation == null ? defaultValue : (T) AnnotationUtils.getValue(annotation, propertyName);
+	}
+
+	/**
+	 * Returns an existing join for the given attribute if one already exists or creates a new one if not.
+	 *
+	 * @param from the {@link From} to get the current joins from.
+	 * @param attribute the {@link Attribute} to look for in the current joins.
+	 * @param joinType the join type to create if none was found
+	 * @return will never be {@literal null}.
+	 */
+	private static Join<?, ?> getOrCreateJoin(From<?, ?> from, String attribute, JoinType joinType) {
+
+		for (Join<?, ?> join : from.getJoins()) {
+
+			if (join.getAttribute().getName().equals(attribute)) {
+				return join;
+			}
+		}
+		return from.join(attribute, joinType);
+	}
+
+	/**
+	 * Return whether the given {@link From} contains an inner join for the attribute with the given name.
+	 *
+	 * @param from the {@link From} to check for joins.
+	 * @param attribute the attribute name to check.
+	 * @return true if the attribute has already been inner joined
+	 */
+	private static boolean isAlreadyInnerJoined(From<?, ?> from, String attribute) {
+
+		for (Fetch<?, ?> fetch : from.getFetches()) {
+
+			if (fetch.getAttribute().getName().equals(attribute) //
+					&& fetch.getJoinType().equals(JoinType.INNER)) {
+				return true;
+			}
+		}
+
+		for (Join<?, ?> join : from.getJoins()) {
+
+			if (join.getAttribute().getName().equals(attribute) //
+					&& join.getJoinType().equals(JoinType.INNER)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check any given {@link JpaOrder#isUnsafe()} order for presence of at least one property offending the
+	 * {@link #PUNCTATION_PATTERN} and throw an {@link Exception} indicating potential unsafe order by expression.
+	 *
+	 * @param order
+	 */
+	static void checkSortExpression(Order order) {
+
+		if (order instanceof JpaOrder jpaOrder && jpaOrder.isUnsafe()) {
+			return;
+		}
+
+		if (PUNCTATION_PATTERN.matcher(order.getProperty()).find()) {
+			throw new InvalidDataAccessApiUsageException(String.format(UNSAFE_PROPERTY_REFERENCE, order));
+		}
+	}
+
+	/**
+	 * Get the {@link Bindable model} that corresponds to the given path utilizing the given {@link ManagedType} if
+	 * present or resolving the model from the {@link Path#getModel() path} by creating it via {@link From#get(String)} in
+	 * case where the type signature may be erased by some vendors if the attribute contains generics.
+	 *
+	 * @param path the current {@link PropertyPath} segment.
+	 * @param managedType primary source for the resulting {@link Bindable}. Can be {@literal null}.
+	 * @param fallback must not be {@literal null}.
+	 * @return the corresponding {@link Bindable} of {@literal null}.
+	 * @see <a href=
+	 *      "https://hibernate.atlassian.net/browse/HHH-16144">https://hibernate.atlassian.net/browse/HHH-16144</a>
+	 * @see <a href=
+	 *      "https://github.com/jakartaee/persistence/issues/562">https://github.com/jakartaee/persistence/issues/562</a>
+	 */
+	@Nullable
+	private static Bindable<?> getModelForPath(PropertyPath path, @Nullable ManagedType<?> managedType,
+			Path<?> fallback) {
+
+		String segment = path.getSegment();
+		if (managedType != null) {
+			try {
+				return (Bindable<?>) managedType.getAttribute(segment);
+			} catch (IllegalArgumentException ex) {
+				// ManagedType may be erased for some vendor if the attribute is declared as generic
+			}
+		}
+
+		return fallback.get(segment).getModel();
+	}
+
+	/**
+	 * Required for EclipseLink: we try to avoid using from.get as EclipseLink produces an inner join regardless of which
+	 * join operation is specified next
+	 *
+	 * @see <a href=
+	 *      "https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892">https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892</a>
+	 * @param model
+	 * @return
+	 */
+	@Nullable
+	private static ManagedType<?> getManagedTypeForModel(Bindable<?> model) {
+
+		if (model instanceof ManagedType<?> managedType) {
+			return managedType;
+		}
+
+		if (!(model instanceof SingularAttribute<?, ?> singularAttribute)) {
+			return null;
+		}
+
+		return singularAttribute.getType() instanceof ManagedType<?> managedType ? managedType : null;
+	}
+}
diff --git a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
index 1d4b51b278..30ad5f2419 100644
--- a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
@@ -11,6 +11,7 @@
 import org.springframework.data.jpa.domain.Specification;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Like {@link org.springframework.data.jpa.repository.JpaSpecificationExecutor} but allows to specify an entity view
@@ -30,7 +31,7 @@ public interface EntityViewSpecificationExecutor<V, E> {
      * @param spec The specification for filtering
      * @return The matching view
      */
-    V findOne(Specification<E> spec);
+    Optional<V> findOne(Specification<E> spec);
 
     /**
      * Returns all views matching the given {@link Specification}.
diff --git a/integration/spring-data/base-3.1/src/main/java/module-info.java b/integration/spring-data/base-3.1/src/main/java/module-info.java
new file mode 100644
index 0000000000..5a3777ab02
--- /dev/null
+++ b/integration/spring-data/base-3.1/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data {
+	requires transitive spring.context;
+	requires transitive spring.data.jpa;
+	requires transitive com.blazebit.persistence.criteria;
+	requires com.blazebit.persistence.view;
+	requires spring.data.commons;
+	requires spring.core;
+	requires com.blazebit.persistence.core.parser;
+	requires spring.tx;
+	requires spring.aop;
+	requires spring.beans;
+	requires com.blazebit.common.utils;
+	exports com.blazebit.persistence.spring.data.annotation;
+	exports com.blazebit.persistence.spring.data.base;
+	exports com.blazebit.persistence.spring.data.base.query;
+	exports com.blazebit.persistence.spring.data.base.repository;
+	exports com.blazebit.persistence.spring.data.repository;
+	exports com.blazebit.persistence.spring.data.repository.config;
+}
\ No newline at end of file
diff --git a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/repository/config/BootstrapMode.java b/integration/spring-data/base-3.1/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
deleted file mode 100644
index 1e43e9e27b..0000000000
--- a/integration/spring-data/base-3.1/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2018-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.repository.config;
-
-/**
- * Enumeration to define in which way repositories are bootstrapped.
- *
- * @author Oliver Gierke
- * @see RepositoryConfigurationSource#getBootstrapMode()
- * @since 2.1
- * @soundtrack Dave Matthews Band - She (Come Tomorrow)
- */
-public enum BootstrapMode {
-
-	/**
-	 * Repository proxies are instantiated eagerly, just like any other Spring bean, except explicitly marked as lazy.
-	 * Thus, injection into repository clients will trigger initialization.
-	 */
-	DEFAULT,
-
-	/**
-	 * Repository bean definitions are considered lazy and clients will get repository proxies injected that will
-	 * initialize on first access. Repository initialization is triggered on application context bootstrap completion.
-	 */
-	DEFERRED,
-
-	/**
-	 * Repository bean definitions are considered lazy, lazily inject and only initialized on first use, i.e. the
-	 * application might have fully started without the repositories initialized.
-	 */
-	LAZY;
-}
diff --git a/integration/spring-data/base-3.3/pom.xml b/integration/spring-data/base-3.3/pom.xml
index b77a43179f..272ed7038b 100644
--- a/integration/spring-data/base-3.3/pom.xml
+++ b/integration/spring-data/base-3.3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,20 +34,19 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -59,12 +58,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,39 +87,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.context;
-                                        requires transitive spring.data.jpa;
-                                        requires transitive com.blazebit.persistence.criteria;
-                                        exports com.blazebit.persistence.spring.data.annotation;
-                                        exports com.blazebit.persistence.spring.data.base;
-                                        exports com.blazebit.persistence.spring.data.base.query;
-                                        exports com.blazebit.persistence.spring.data.base.repository;
-                                        exports com.blazebit.persistence.spring.data.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
 </project>
diff --git a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
index 99fc86b420..361fd8ec6d 100644
--- a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
@@ -40,9 +40,6 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.FixedJpaCountQueryCreator;
-import org.springframework.data.jpa.repository.query.FixedJpaQueryCreator;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
 import org.springframework.data.jpa.repository.query.JpaEntityGraph;
 import org.springframework.data.jpa.repository.query.PartTreeJpaQuery;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
@@ -55,7 +52,7 @@
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
-import java.util.Collections;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
similarity index 89%
rename from integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
rename to integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
index b7e873a8b8..f85b523558 100644
--- a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaCountQueryCreator.java
@@ -3,9 +3,8 @@
  * Copyright Blazebit
  */
 
-package org.springframework.data.jpa.repository.query;
+package com.blazebit.persistence.spring.data.base.query;
 
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.parser.PartTree;
 
diff --git a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
similarity index 97%
rename from integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
rename to integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
index 1d973d6289..e438103a11 100644
--- a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.springframework.data.jpa.repository.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
+package com.blazebit.persistence.spring.data.base.query;
 
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.query.JpaQueryCreator;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
@@ -36,7 +35,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import static org.springframework.data.jpa.repository.query.QueryUtils.toExpressionRecursively;
 import static org.springframework.data.repository.query.parser.Part.Type.NOT_CONTAINING;
 import static org.springframework.data.repository.query.parser.Part.Type.NOT_LIKE;
 
@@ -112,7 +110,7 @@ protected final CriteriaQuery<Object> complete(Predicate predicate, Sort sort) {
      */
     protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort, CriteriaQuery<Object> query,
                                              CriteriaBuilder builder, Root<?> root) {
-        CriteriaQuery<Object> select = this.query.select(root).orderBy(QueryUtils.toOrders(sort, root, builder));
+        CriteriaQuery<Object> select = this.query.select(root).orderBy( QueryUtils.toOrders( sort, root, builder));
         return predicate == null ? select : select.where(predicate);
     }
 
@@ -288,7 +286,7 @@ private Expression<? extends Comparable> getComparablePath(Root<?> root, Part pa
         }
 
         private <T> Expression<T> getTypedPath(Root<?> root, Part part) {
-            return toExpressionRecursively(root, part.getProperty());
+            return QueryUtils.toExpressionRecursively( root, part.getProperty());
         }
 
         private <T> Expression<T> traversePath(Path<?> root, PropertyPath path) {
diff --git a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java
new file mode 100644
index 0000000000..54e6457052
--- /dev/null
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java
@@ -0,0 +1,1009 @@
+/*
+ * Copyright 2008-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.blazebit.persistence.spring.data.base.query;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Member;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Fetch;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.jpa.domain.JpaSort.JpaOrder;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.util.Streamable;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ELEMENT_COLLECTION;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.MANY_TO_MANY;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.MANY_TO_ONE;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_MANY;
+import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_ONE;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import static java.util.regex.Pattern.DOTALL;
+import static java.util.regex.Pattern.MULTILINE;
+import static java.util.regex.Pattern.compile;
+
+/**
+ * Simple utility class to create JPA queries using the default implementation of a custom parser.
+ *
+ * @author Oliver Gierke
+ * @author Kevin Raymond
+ * @author Thomas Darimont
+ * @author Komi Innocent
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Sébastien Péralta
+ * @author Jens Schauder
+ * @author Nils Borrmann
+ * @author Reda.Housni-Alaoui
+ * @author Florian Lüdiger
+ * @author Grégoire Druant
+ * @author Mohammad Hewedy
+ * @author Andriy Redko
+ * @author Peter Großmann
+ * @author Greg Turnquist
+ * @author Diego Krupitza
+ * @author Jędrzej Biedrzycki
+ * @author Darin Manica
+ * @author Simon Paradies
+ * @author Vladislav Yukharin
+ * @author Chris Fraser
+ * @author Donghun Shin
+ * @author Pranav HS
+ * @author Eduard Dudar
+ * @author Yanming Zhou
+ */
+public abstract class QueryUtils {
+
+	public static final String COUNT_QUERY_STRING = "select count(%s) from %s x";
+	public static final String DELETE_ALL_QUERY_STRING = "delete from %s x";
+	public static final String DELETE_ALL_QUERY_BY_ID_STRING = "delete from %s x where %s in :ids";
+
+	// Used Regex/Unicode categories (see https://www.unicode.org/reports/tr18/#General_Category_Property):
+	// Z Separator
+	// Cc Control
+	// Cf Format
+	// Punct Punctuation
+	private static final String IDENTIFIER = "[._$[\\P{Z}&&\\P{Cc}&&\\P{Cf}&&\\P{Punct}]]+";
+	static final String COLON_NO_DOUBLE_COLON = "(?<![:\\\\]):";
+	static final String IDENTIFIER_GROUP = String.format("(%s)", IDENTIFIER);
+
+	private static final String COUNT_REPLACEMENT_TEMPLATE = "select count(%s) $5$6$7";
+	private static final String SIMPLE_COUNT_VALUE = "$2";
+	private static final String COMPLEX_COUNT_VALUE = "$3 $6";
+	private static final String COMPLEX_COUNT_LAST_VALUE = "$6";
+	private static final Pattern ORDER_BY_PART = Pattern.compile("(?iu)\\s+order\\s+by\\s+.*", CASE_INSENSITIVE | DOTALL);
+
+	private static final Pattern ALIAS_MATCH;
+	private static final Pattern COUNT_MATCH;
+	private static final Pattern STARTS_WITH_PAREN = Pattern.compile("^\\s*\\(");
+	private static final Pattern PARENS_TO_REMOVE = Pattern.compile("(\\(.*\\bfrom\\b[^)]+\\))",
+			CASE_INSENSITIVE | DOTALL | MULTILINE);
+	private static final Pattern PROJECTION_CLAUSE = Pattern.compile("select\\s+(?:distinct\\s+)?(.+)\\s+from",
+			Pattern.CASE_INSENSITIVE);
+
+	private static final Pattern NO_DIGITS = Pattern.compile("\\D+");
+
+	private static final String JOIN = "join\\s+(fetch\\s+)?" + IDENTIFIER + "\\s+(as\\s+)?" + IDENTIFIER_GROUP;
+	private static final Pattern JOIN_PATTERN = Pattern.compile(JOIN, Pattern.CASE_INSENSITIVE);
+
+	private static final String EQUALS_CONDITION_STRING = "%s.%s = :%s";
+	private static final Pattern ORDER_BY = Pattern.compile("(order\\s+by\\s+)", CASE_INSENSITIVE);
+	private static final Pattern ORDER_BY_IN_WINDOW_OR_SUBSELECT = Pattern
+			.compile("\\([\\s\\S]*order\\s+by\\s[\\s\\S]*\\)", CASE_INSENSITIVE);
+
+	private static final Pattern NAMED_PARAMETER = Pattern.compile(COLON_NO_DOUBLE_COLON + IDENTIFIER + "|#" + IDENTIFIER,
+			CASE_INSENSITIVE);
+
+	private static final Pattern CONSTRUCTOR_EXPRESSION;
+
+	private static final Map<PersistentAttributeType, Class<? extends Annotation>> ASSOCIATION_TYPES;
+
+	private static final int QUERY_JOIN_ALIAS_GROUP_INDEX = 3;
+	private static final int VARIABLE_NAME_GROUP_INDEX = 4;
+	private static final int COMPLEX_COUNT_FIRST_INDEX = 3;
+
+	private static final Pattern PUNCTATION_PATTERN = Pattern.compile(".*((?![._])[\\p{Punct}|\\s])");
+	private static final Pattern FUNCTION_PATTERN;
+	private static final Pattern FIELD_ALIAS_PATTERN;
+
+	private static final String UNSAFE_PROPERTY_REFERENCE = "Sort expression '%s' must only contain property references or "
+			+ "aliases used in the select clause; If you really want to use something other than that for sorting, please use "
+			+ "JpaSort.unsafe(…)";
+
+	static {
+
+		StringBuilder builder = new StringBuilder();
+		builder.append("(?<=\\bfrom)"); // from as starting delimiter
+		builder.append("(?:\\s)+"); // at least one space separating
+		builder.append(IDENTIFIER_GROUP); // Entity name, can be qualified (any
+		builder.append("(?:\\sas)*"); // exclude possible "as" keyword
+		builder.append("(?:\\s)+"); // at least one space separating
+		builder.append("(?!(?:where|group\\s*by|order\\s*by))(\\w+)"); // the actual alias
+
+		ALIAS_MATCH = compile(builder.toString(), CASE_INSENSITIVE);
+
+		builder = new StringBuilder();
+		builder.append("\\s*");
+		builder.append("(select\\s+((distinct)?((?s).+?)?)\\s+)?(from\\s+");
+		builder.append(IDENTIFIER);
+		builder.append("(?:\\s+as)?\\s*)");
+		builder.append(IDENTIFIER_GROUP);
+		builder.append("(.*)");
+
+		COUNT_MATCH = compile(builder.toString(), CASE_INSENSITIVE | DOTALL);
+
+		Map<PersistentAttributeType, Class<? extends Annotation>> persistentAttributeTypes = new HashMap<>();
+		persistentAttributeTypes.put(ONE_TO_ONE, OneToOne.class);
+		persistentAttributeTypes.put(ONE_TO_MANY, null);
+		persistentAttributeTypes.put(MANY_TO_ONE, ManyToOne.class);
+		persistentAttributeTypes.put(MANY_TO_MANY, null);
+		persistentAttributeTypes.put(ELEMENT_COLLECTION, null);
+
+		ASSOCIATION_TYPES = Collections.unmodifiableMap(persistentAttributeTypes);
+
+		builder = new StringBuilder();
+		builder.append("select");
+		builder.append("\\s+"); // at least one space separating
+		builder.append("(.*\\s+)?"); // anything in between (e.g. distinct) at least one space separating
+		builder.append("new");
+		builder.append("\\s+"); // at least one space separating
+		builder.append(IDENTIFIER);
+		builder.append("\\s*"); // zero to unlimited space separating
+		builder.append("\\(");
+		builder.append(".*");
+		builder.append("\\)");
+
+		CONSTRUCTOR_EXPRESSION = compile(builder.toString(), CASE_INSENSITIVE + DOTALL);
+
+		builder = new StringBuilder();
+		// any function call including parameters within the brackets
+		builder.append("\\w+\\s*\\([\\w\\.,\\s'=:;\\\\?]+\\)");
+		// the potential alias
+		builder.append("\\s+[as|AS]+\\s+(([\\w\\.]+))");
+
+		FUNCTION_PATTERN = compile(builder.toString());
+
+		builder = new StringBuilder();
+		builder.append("\\s+"); // at least one space
+		builder.append("[^\\s\\(\\)]+"); // No white char no bracket
+		builder.append("\\s+[as|AS]+\\s+(([\\w\\.]+))"); // the potential alias
+
+		FIELD_ALIAS_PATTERN = compile(builder.toString());
+
+	}
+
+	/**
+	 * Private constructor to prevent instantiation.
+	 */
+	private QueryUtils() {
+
+	}
+
+	/**
+	 * Returns the query string to execute an exists query for the given id attributes.
+	 *
+	 * @param entityName the name of the entity to create the query for, must not be {@literal null}.
+	 * @param countQueryPlaceHolder the placeholder for the count clause, must not be {@literal null}.
+	 * @param idAttributes the id attributes for the entity, must not be {@literal null}.
+	 */
+	public static String getExistsQueryString(String entityName, String countQueryPlaceHolder,
+			Iterable<String> idAttributes) {
+
+		String whereClause = Streamable.of(idAttributes).stream() //
+				.map(idAttribute -> String.format(EQUALS_CONDITION_STRING, "x", idAttribute, idAttribute)) //
+				.collect(Collectors.joining(" AND ", " WHERE ", ""));
+
+		return String.format(COUNT_QUERY_STRING, countQueryPlaceHolder, entityName) + whereClause;
+	}
+
+	/**
+	 * Returns the query string for the given class name.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @param entityName must not be {@literal null}.
+	 * @return the template with placeholders replaced by the {@literal entityName}. Guaranteed to be not {@literal null}.
+	 */
+	public static String getQueryString(String template, String entityName) {
+
+		Assert.hasText(entityName, "Entity name must not be null or empty");
+
+		return String.format(template, entityName);
+	}
+
+	/**
+	 * Adds {@literal order by} clause to the JPQL query. Uses the first alias to bind the sorting property to.
+	 *
+	 * @param query the query string to which sorting is applied
+	 * @param sort the sort specification to apply.
+	 * @return the modified query string.
+	 */
+	public static String applySorting(String query, Sort sort) {
+		return applySorting(query, sort, detectAlias(query));
+	}
+
+	/**
+	 * Adds {@literal order by} clause to the JPQL query.
+	 *
+	 * @param query the query string to which sorting is applied. Must not be {@literal null} or empty.
+	 * @param sort the sort specification to apply.
+	 * @param alias the alias to be used in the order by clause. May be {@literal null} or empty.
+	 * @return the modified query string.
+	 */
+	public static String applySorting(String query, Sort sort, @Nullable String alias) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		if (sort.isUnsorted()) {
+			return query;
+		}
+
+		StringBuilder builder = new StringBuilder(query);
+
+		if (hasOrderByClause(query)) {
+			builder.append(", ");
+		} else {
+			builder.append(" order by ");
+		}
+
+		Set<String> joinAliases = getOuterJoinAliases(query);
+		Set<String> selectionAliases = getFunctionAliases(query);
+		selectionAliases.addAll(getFieldAliases(query));
+
+		for (Order order : sort) {
+			builder.append(getOrderClause(joinAliases, selectionAliases, alias, order)).append(", ");
+		}
+
+		builder.delete(builder.length() - 2, builder.length());
+
+		return builder.toString();
+	}
+
+	/**
+	 * Returns {@code true} if the query has {@code order by} clause. The query has {@code order by} clause if there is an
+	 * {@code order by} which is not part of window clause.
+	 *
+	 * @param query the analysed query string
+	 * @return {@code true} if the query has {@code order by} clause, {@code false} otherwise
+	 */
+	private static boolean hasOrderByClause(String query) {
+		return countOccurrences(ORDER_BY, query) > countOccurrences(ORDER_BY_IN_WINDOW_OR_SUBSELECT, query);
+	}
+
+	/**
+	 * Counts the number of occurrences of the pattern in the string
+	 *
+	 * @param pattern regex with a group to match
+	 * @param string analysed string
+	 * @return the number of occurrences of the pattern in the string
+	 */
+	private static int countOccurrences(Pattern pattern, String string) {
+
+		Matcher matcher = pattern.matcher(string);
+
+		int occurrences = 0;
+		while (matcher.find()) {
+			occurrences++;
+		}
+		return occurrences;
+	}
+
+	/**
+	 * Returns the order clause for the given {@link Order}. Will prefix the clause with the given alias if the referenced
+	 * property refers to a join alias, i.e. starts with {@code $alias.}.
+	 *
+	 * @param joinAliases the join aliases of the original query. Must not be {@literal null}.
+	 * @param alias the alias for the root entity. May be {@literal null}.
+	 * @param order the order object to build the clause for. Must not be {@literal null}.
+	 * @return a String containing an order clause. Guaranteed to be not {@literal null}.
+	 */
+	private static String getOrderClause(Set<String> joinAliases, Set<String> selectionAlias, @Nullable String alias,
+			Order order) {
+
+		String property = order.getProperty();
+
+		checkSortExpression(order);
+
+		if (selectionAlias.contains(property)) {
+
+			return String.format("%s %s", //
+					order.isIgnoreCase() ? String.format("lower(%s)", property) : property, //
+					toJpaDirection(order));
+		}
+
+		boolean qualifyReference = !property.contains("("); // ( indicates a function
+
+		for (String joinAlias : joinAliases) {
+
+			if (property.startsWith(joinAlias.concat("."))) {
+
+				qualifyReference = false;
+				break;
+			}
+		}
+
+		String reference = qualifyReference && StringUtils.hasText(alias) ? String.format("%s.%s", alias, property)
+				: property;
+		String wrapped = order.isIgnoreCase() ? String.format("lower(%s)", reference) : reference;
+
+		return String.format("%s %s", wrapped, toJpaDirection(order));
+	}
+
+	/**
+	 * Returns the aliases used for {@code left (outer) join}s.
+	 *
+	 * @param query a query string to extract the aliases of joins from. Must not be {@literal null}.
+	 * @return a {@literal Set} of aliases used in the query. Guaranteed to be not {@literal null}.
+	 */
+	static Set<String> getOuterJoinAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = JOIN_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+
+			String alias = matcher.group(QUERY_JOIN_ALIAS_GROUP_INDEX);
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Returns the aliases used for fields in the query.
+	 *
+	 * @param query a {@literal String} containing a query. Must not be {@literal null}.
+	 * @return a {@literal Set} containing all found aliases. Guaranteed to be not {@literal null}.
+	 */
+	private static Set<String> getFieldAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = FIELD_ALIAS_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+			String alias = matcher.group(1);
+
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the aliases used for aggregate functions like {@code SUM, COUNT, ...}.
+	 *
+	 * @param query a {@literal String} containing a query. Must not be {@literal null}.
+	 * @return a {@literal Set} containing all found aliases. Guaranteed to be not {@literal null}.
+	 */
+	static Set<String> getFunctionAliases(String query) {
+
+		Set<String> result = new HashSet<>();
+		Matcher matcher = FUNCTION_PATTERN.matcher(query);
+
+		while (matcher.find()) {
+
+			String alias = matcher.group(1);
+
+			if (StringUtils.hasText(alias)) {
+				result.add(alias);
+			}
+		}
+
+		return result;
+	}
+
+	private static String toJpaDirection(Order order) {
+		return order.getDirection().name().toLowerCase(Locale.US);
+	}
+
+	/**
+	 * Resolves the alias for the entity to be retrieved from the given JPA query.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return Might return {@literal null}.
+	 * @deprecated use {@link DeclaredQuery#getAlias()} instead.
+	 */
+	@Nullable
+	@Deprecated
+	public static String detectAlias(String query) {
+
+		String alias = null;
+		Matcher matcher = ALIAS_MATCH.matcher(removeSubqueries(query));
+		while (matcher.find()) {
+			alias = matcher.group(2);
+		}
+		return alias;
+	}
+
+	/**
+	 * Remove subqueries from the query, in order to identify the correct alias in order by clauses. If the entire query
+	 * is surrounded by parenthesis, the outermost parenthesis are not removed.
+	 *
+	 * @param query
+	 * @return query with all subqueries removed.
+	 */
+	static String removeSubqueries(String query) {
+
+		if (!StringUtils.hasText(query)) {
+			return query;
+		}
+
+		List<Integer> opens = new ArrayList<>();
+		List<Integer> closes = new ArrayList<>();
+		List<Boolean> closeMatches = new ArrayList<>();
+
+		for (int i = 0; i < query.length(); i++) {
+
+			char c = query.charAt(i);
+			if (c == '(') {
+				opens.add(i);
+			} else if (c == ')') {
+				closes.add(i);
+				closeMatches.add(Boolean.FALSE);
+			}
+		}
+
+		StringBuilder sb = new StringBuilder(query);
+		boolean startsWithParen = STARTS_WITH_PAREN.matcher(query).find();
+		for (int i = opens.size() - 1; i >= (startsWithParen ? 1 : 0); i--) {
+
+			Integer open = opens.get(i);
+			Integer close = findClose(open, closes, closeMatches) + 1;
+
+			if (close > open) {
+
+				String subquery = sb.substring(open, close);
+				Matcher matcher = PARENS_TO_REMOVE.matcher(subquery);
+				if (matcher.find()) {
+					sb.replace(open, close, new String(new char[close - open]).replace('\0', ' '));
+				}
+			}
+		}
+
+		return sb.toString();
+	}
+
+	private static Integer findClose(final Integer open, final List<Integer> closes, final List<Boolean> closeMatches) {
+
+		for (int i = 0; i < closes.size(); i++) {
+
+			int close = closes.get(i);
+			if (close > open && !closeMatches.get(i)) {
+				closeMatches.set(i, Boolean.TRUE);
+				return close;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Creates a where-clause referencing the given entities and appends it to the given query string. Binds the given
+	 * entities to the query.
+	 *
+	 * @param <T> type of the entities.
+	 * @param queryString must not be {@literal null}.
+	 * @param entities must not be {@literal null}.
+	 * @param entityManager must not be {@literal null}.
+	 * @return Guaranteed to be not {@literal null}.
+	 */
+
+	public static <T> Query applyAndBind(String queryString, Iterable<T> entities, EntityManager entityManager) {
+
+		Assert.notNull(queryString, "Querystring must not be null");
+		Assert.notNull(entities, "Iterable of entities must not be null");
+		Assert.notNull(entityManager, "EntityManager must not be null");
+
+		Iterator<T> iterator = entities.iterator();
+
+		if (!iterator.hasNext()) {
+			return entityManager.createQuery(queryString);
+		}
+
+		String alias = detectAlias(queryString);
+		StringBuilder builder = new StringBuilder(queryString);
+		builder.append(" where");
+
+		int i = 0;
+
+		while (iterator.hasNext()) {
+
+			iterator.next();
+
+			builder.append(String.format(" %s = ?%d", alias, ++i));
+
+			if (iterator.hasNext()) {
+				builder.append(" or");
+			}
+		}
+
+		Query query = entityManager.createQuery(builder.toString());
+
+		iterator = entities.iterator();
+		i = 0;
+
+		while (iterator.hasNext()) {
+			query.setParameter(++i, iterator.next());
+		}
+
+		return query;
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null} or empty.
+	 * @return Guaranteed to be not {@literal null}.
+	 * @deprecated use {@link DeclaredQuery#deriveCountQuery(String)} instead.
+	 */
+	@Deprecated
+	public static String createCountQueryFor(String originalQuery) {
+		return createCountQueryFor(originalQuery, null);
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null}.
+	 * @param countProjection may be {@literal null}.
+	 * @return a query String to be used a count query for pagination. Guaranteed to be not {@literal null}.
+	 * @since 1.6
+	 * @deprecated use {@link DeclaredQuery#deriveCountQuery(String)} instead.
+	 */
+	@Deprecated
+	public static String createCountQueryFor(String originalQuery, @Nullable String countProjection) {
+		return createCountQueryFor(originalQuery, countProjection, false);
+	}
+
+	/**
+	 * Creates a count projected query from the given original query.
+	 *
+	 * @param originalQuery must not be {@literal null}.
+	 * @param countProjection may be {@literal null}.
+	 * @param nativeQuery whether the underlying query is a native query.
+	 * @return a query String to be used a count query for pagination. Guaranteed to be not {@literal null}.
+	 * @since 2.7.8
+	 */
+	static String createCountQueryFor(String originalQuery, @Nullable String countProjection, boolean nativeQuery) {
+
+		Assert.hasText(originalQuery, "OriginalQuery must not be null or empty");
+
+		Matcher matcher = COUNT_MATCH.matcher(originalQuery);
+		String countQuery;
+
+		if (countProjection == null) {
+
+			String variable = matcher.matches() ? matcher.group(VARIABLE_NAME_GROUP_INDEX) : null;
+			boolean useVariable = StringUtils.hasText(variable) //
+					&& !variable.startsWith("new") // select [new com.example.User...
+					&& !variable.startsWith(" new") // select distinct[ new com.example.User...
+					&& !variable.startsWith("count(") // select [count(...
+					&& !variable.contains(",");
+
+			String complexCountValue = matcher.matches() && StringUtils.hasText(matcher.group(COMPLEX_COUNT_FIRST_INDEX))
+					? COMPLEX_COUNT_VALUE
+					: COMPLEX_COUNT_LAST_VALUE;
+
+			String replacement = useVariable ? SIMPLE_COUNT_VALUE : complexCountValue;
+
+			if (variable != null && (nativeQuery && (variable.contains(",") || "*".equals(variable)))) {
+				replacement = "1";
+			} else {
+
+				String alias = QueryUtils.detectAlias(originalQuery);
+				if ("*".equals(variable) && alias != null) {
+					replacement = alias;
+				}
+			}
+
+			countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, replacement));
+		} else {
+			countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, countProjection));
+		}
+
+		return ORDER_BY_PART.matcher(countQuery).replaceFirst("");
+	}
+
+	/**
+	 * Returns whether the given {@link Query} contains named parameters.
+	 *
+	 * @param query Must not be {@literal null}.
+	 * @return whether the given {@link Query} contains named parameters.
+	 */
+	public static boolean hasNamedParameter(Query query) {
+
+		Assert.notNull(query, "Query must not be null");
+
+		for (Parameter<?> parameter : query.getParameters()) {
+
+			String name = parameter.getName();
+
+			// Hibernate 3 specific hack as it returns the index as String for the name.
+			if (name != null && NO_DIGITS.matcher(name).find()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether the given query contains named parameters.
+	 *
+	 * @param query can be {@literal null} or empty.
+	 * @return whether the given query contains named parameters.
+	 */
+	@Deprecated
+	static boolean hasNamedParameter(@Nullable String query) {
+		return StringUtils.hasText(query) && NAMED_PARAMETER.matcher(query).find();
+	}
+
+	/**
+	 * Turns the given {@link Sort} into {@link jakarta.persistence.criteria.Order}s.
+	 *
+	 * @param sort the {@link Sort} instance to be transformed into JPA {@link jakarta.persistence.criteria.Order}s.
+	 * @param from must not be {@literal null}.
+	 * @param cb must not be {@literal null}.
+	 * @return a {@link List} of {@link jakarta.persistence.criteria.Order}s.
+	 */
+	public static List<jakarta.persistence.criteria.Order> toOrders(Sort sort, From<?, ?> from, CriteriaBuilder cb) {
+
+		if (sort.isUnsorted()) {
+			return Collections.emptyList();
+		}
+
+		Assert.notNull(from, "From must not be null");
+		Assert.notNull(cb, "CriteriaBuilder must not be null");
+
+		List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();
+
+		for ( Order order : sort) {
+			orders.add(toJpaOrder(order, from, cb));
+		}
+
+		return orders;
+	}
+
+	/**
+	 * Returns whether the given JPQL query contains a constructor expression.
+	 *
+	 * @param query must not be {@literal null} or empty.
+	 * @return whether the given JPQL query contains a constructor expression.
+	 * @since 1.10
+	 */
+	public static boolean hasConstructorExpression(String query) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		return CONSTRUCTOR_EXPRESSION.matcher(query).find();
+	}
+
+	/**
+	 * Returns the projection part of the query, i.e. everything between {@code select} and {@code from}.
+	 *
+	 * @param query must not be {@literal null} or empty.
+	 * @return the projection part of the query.
+	 * @since 1.10.2
+	 */
+	public static String getProjection(String query) {
+
+		Assert.hasText(query, "Query must not be null or empty");
+
+		Matcher matcher = PROJECTION_CLAUSE.matcher(query);
+		String projection = matcher.find() ? matcher.group(1) : "";
+		return projection.trim();
+	}
+
+	/**
+	 * Creates a criteria API {@link jakarta.persistence.criteria.Order} from the given {@link Order}.
+	 *
+	 * @param order the order to transform into a JPA {@link jakarta.persistence.criteria.Order}
+	 * @param from the {@link From} the {@link Order} expression is based on
+	 * @param cb the {@link CriteriaBuilder} to build the {@link jakarta.persistence.criteria.Order} with
+	 * @return Guaranteed to be not {@literal null}.
+	 */
+	@SuppressWarnings("unchecked")
+	private static jakarta.persistence.criteria.Order toJpaOrder(Order order, From<?, ?> from, CriteriaBuilder cb) {
+
+		PropertyPath property = PropertyPath.from(order.getProperty(), from.getJavaType());
+		Expression<?> expression = toExpressionRecursively(from, property);
+
+		if (order.isIgnoreCase() && String.class.equals(expression.getJavaType())) {
+			Expression<String> upper = cb.lower((Expression<String>) expression);
+			return order.isAscending() ? cb.asc(upper) : cb.desc(upper);
+		} else {
+			return order.isAscending() ? cb.asc(expression) : cb.desc(expression);
+		}
+	}
+
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property) {
+		return toExpressionRecursively(from, property, false);
+	}
+
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property, boolean isForSelection) {
+		return toExpressionRecursively(from, property, isForSelection, false);
+	}
+
+	/**
+	 * Creates an expression with proper inner and left joins by recursively navigating the path
+	 *
+	 * @param from the {@link From}
+	 * @param property the property path
+	 * @param isForSelection is the property navigated for the selection or ordering part of the query?
+	 * @param hasRequiredOuterJoin has a parent already required an outer join?
+	 * @param <T> the type of the expression
+	 * @return the expression
+	 */
+	@SuppressWarnings("unchecked")
+	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property, boolean isForSelection,
+			boolean hasRequiredOuterJoin) {
+
+		String segment = property.getSegment();
+
+		boolean isLeafProperty = !property.hasNext();
+
+		boolean requiresOuterJoin = requiresOuterJoin(from, property, isForSelection, hasRequiredOuterJoin);
+
+		// if it does not require an outer join and is a leaf, simply get the segment
+		if (!requiresOuterJoin && isLeafProperty) {
+			return from.get(segment);
+		}
+
+		// get or create the join
+		JoinType joinType = requiresOuterJoin ? JoinType.LEFT : JoinType.INNER;
+		Join<?, ?> join = getOrCreateJoin(from, segment, joinType);
+
+		// if it's a leaf, return the join
+		if (isLeafProperty) {
+			return (Expression<T>) join;
+		}
+
+		PropertyPath nextProperty = Objects.requireNonNull(property.next(), "An element of the property path is null");
+
+		// recurse with the next property
+		return toExpressionRecursively(join, nextProperty, isForSelection, requiresOuterJoin);
+	}
+
+	/**
+	 * Checks if this attribute requires an outer join. This is the case e.g. if it hadn't already been fetched with an
+	 * inner join and if it's an optional association, and if previous paths has already required outer joins. It also
+	 * ensures outer joins are used even when Hibernate defaults to inner joins (HHH-12712 and HHH-12999).
+	 *
+	 * @param from the {@link From} to check for fetches.
+	 * @param property the property path
+	 * @param isForSelection is the property navigated for the selection or ordering part of the query? if true, we need
+	 *          to generate an explicit outer join in order to prevent Hibernate to use an inner join instead. see
+	 *          https://hibernate.atlassian.net/browse/HHH-12999
+	 * @param hasRequiredOuterJoin has a parent already required an outer join?
+	 * @return whether an outer join is to be used for integrating this attribute in a query.
+	 */
+	private static boolean requiresOuterJoin(From<?, ?> from, PropertyPath property, boolean isForSelection,
+			boolean hasRequiredOuterJoin) {
+
+		// already inner joined so outer join is useless
+		if (isAlreadyInnerJoined(from, property.getSegment())) {
+			return false;
+		}
+
+		Bindable<?> model = from.getModel();
+		ManagedType<?> managedType = getManagedTypeForModel(model);
+		Bindable<?> propertyPathModel = getModelForPath(property, managedType, from);
+
+		// is the attribute of Collection type?
+		boolean isPluralAttribute = model instanceof PluralAttribute;
+
+		if (propertyPathModel == null && isPluralAttribute) {
+			return true;
+		}
+
+		if (!(propertyPathModel instanceof Attribute<?, ?> attribute)) {
+			return false;
+		}
+
+		// not a persistent attribute type association (@OneToOne, @ManyToOne)
+		if (!ASSOCIATION_TYPES.containsKey(attribute.getPersistentAttributeType())) {
+			return false;
+		}
+
+		boolean isCollection = attribute.isCollection();
+		// if this path is an optional one to one attribute navigated from the not owning side we also need an
+		// explicit outer join to avoid https://hibernate.atlassian.net/browse/HHH-12712
+		// and https://github.com/eclipse-ee4j/jpa-api/issues/170
+		boolean isInverseOptionalOneToOne = PersistentAttributeType.ONE_TO_ONE == attribute.getPersistentAttributeType()
+				&& StringUtils.hasText(getAnnotationProperty(attribute, "mappedBy", ""));
+
+		boolean isLeafProperty = !property.hasNext();
+		if (isLeafProperty && !isForSelection && !isCollection && !isInverseOptionalOneToOne && !hasRequiredOuterJoin) {
+			return false;
+		}
+
+		return hasRequiredOuterJoin || getAnnotationProperty(attribute, "optional", true);
+	}
+
+	@Nullable
+	private static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String propertyName, T defaultValue) {
+
+		Class<? extends Annotation> associationAnnotation = ASSOCIATION_TYPES.get(attribute.getPersistentAttributeType());
+
+		if (associationAnnotation == null) {
+			return defaultValue;
+		}
+
+		Member member = attribute.getJavaMember();
+
+		if (!(member instanceof AnnotatedElement annotatedMember)) {
+			return defaultValue;
+		}
+
+		Annotation annotation = AnnotationUtils.getAnnotation(annotatedMember, associationAnnotation);
+		return annotation == null ? defaultValue : (T) AnnotationUtils.getValue(annotation, propertyName);
+	}
+
+	/**
+	 * Returns an existing join for the given attribute if one already exists or creates a new one if not.
+	 *
+	 * @param from the {@link From} to get the current joins from.
+	 * @param attribute the {@link Attribute} to look for in the current joins.
+	 * @param joinType the join type to create if none was found
+	 * @return will never be {@literal null}.
+	 */
+	private static Join<?, ?> getOrCreateJoin(From<?, ?> from, String attribute, JoinType joinType) {
+
+		for (Join<?, ?> join : from.getJoins()) {
+
+			if (join.getAttribute().getName().equals(attribute)) {
+				return join;
+			}
+		}
+		return from.join(attribute, joinType);
+	}
+
+	/**
+	 * Return whether the given {@link From} contains an inner join for the attribute with the given name.
+	 *
+	 * @param from the {@link From} to check for joins.
+	 * @param attribute the attribute name to check.
+	 * @return true if the attribute has already been inner joined
+	 */
+	private static boolean isAlreadyInnerJoined(From<?, ?> from, String attribute) {
+
+		for (Fetch<?, ?> fetch : from.getFetches()) {
+
+			if (fetch.getAttribute().getName().equals(attribute) //
+					&& fetch.getJoinType().equals(JoinType.INNER)) {
+				return true;
+			}
+		}
+
+		for (Join<?, ?> join : from.getJoins()) {
+
+			if (join.getAttribute().getName().equals(attribute) //
+					&& join.getJoinType().equals(JoinType.INNER)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check any given {@link JpaOrder#isUnsafe()} order for presence of at least one property offending the
+	 * {@link #PUNCTATION_PATTERN} and throw an {@link Exception} indicating potential unsafe order by expression.
+	 *
+	 * @param order
+	 */
+	static void checkSortExpression(Order order) {
+
+		if (order instanceof JpaOrder jpaOrder && jpaOrder.isUnsafe()) {
+			return;
+		}
+
+		if (PUNCTATION_PATTERN.matcher(order.getProperty()).find()) {
+			throw new InvalidDataAccessApiUsageException(String.format(UNSAFE_PROPERTY_REFERENCE, order));
+		}
+	}
+
+	/**
+	 * Get the {@link Bindable model} that corresponds to the given path utilizing the given {@link ManagedType} if
+	 * present or resolving the model from the {@link Path#getModel() path} by creating it via {@link From#get(String)} in
+	 * case where the type signature may be erased by some vendors if the attribute contains generics.
+	 *
+	 * @param path the current {@link PropertyPath} segment.
+	 * @param managedType primary source for the resulting {@link Bindable}. Can be {@literal null}.
+	 * @param fallback must not be {@literal null}.
+	 * @return the corresponding {@link Bindable} of {@literal null}.
+	 * @see <a href=
+	 *      "https://hibernate.atlassian.net/browse/HHH-16144">https://hibernate.atlassian.net/browse/HHH-16144</a>
+	 * @see <a href=
+	 *      "https://github.com/jakartaee/persistence/issues/562">https://github.com/jakartaee/persistence/issues/562</a>
+	 */
+	@Nullable
+	private static Bindable<?> getModelForPath(PropertyPath path, @Nullable ManagedType<?> managedType,
+			Path<?> fallback) {
+
+		String segment = path.getSegment();
+		if (managedType != null) {
+			try {
+				return (Bindable<?>) managedType.getAttribute(segment);
+			} catch (IllegalArgumentException ex) {
+				// ManagedType may be erased for some vendor if the attribute is declared as generic
+			}
+		}
+
+		return fallback.get(segment).getModel();
+	}
+
+	/**
+	 * Required for EclipseLink: we try to avoid using from.get as EclipseLink produces an inner join regardless of which
+	 * join operation is specified next
+	 *
+	 * @see <a href=
+	 *      "https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892">https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892</a>
+	 * @param model
+	 * @return
+	 */
+	@Nullable
+	private static ManagedType<?> getManagedTypeForModel(Bindable<?> model) {
+
+		if (model instanceof ManagedType<?> managedType) {
+			return managedType;
+		}
+
+		if (!(model instanceof SingularAttribute<?, ?> singularAttribute)) {
+			return null;
+		}
+
+		return singularAttribute.getType() instanceof ManagedType<?> managedType ? managedType : null;
+	}
+}
diff --git a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
index 1d4b51b278..30ad5f2419 100644
--- a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
@@ -11,6 +11,7 @@
 import org.springframework.data.jpa.domain.Specification;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Like {@link org.springframework.data.jpa.repository.JpaSpecificationExecutor} but allows to specify an entity view
@@ -30,7 +31,7 @@ public interface EntityViewSpecificationExecutor<V, E> {
      * @param spec The specification for filtering
      * @return The matching view
      */
-    V findOne(Specification<E> spec);
+    Optional<V> findOne(Specification<E> spec);
 
     /**
      * Returns all views matching the given {@link Specification}.
diff --git a/integration/spring-data/base-3.3/src/main/java/module-info.java b/integration/spring-data/base-3.3/src/main/java/module-info.java
new file mode 100644
index 0000000000..5a3777ab02
--- /dev/null
+++ b/integration/spring-data/base-3.3/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data {
+	requires transitive spring.context;
+	requires transitive spring.data.jpa;
+	requires transitive com.blazebit.persistence.criteria;
+	requires com.blazebit.persistence.view;
+	requires spring.data.commons;
+	requires spring.core;
+	requires com.blazebit.persistence.core.parser;
+	requires spring.tx;
+	requires spring.aop;
+	requires spring.beans;
+	requires com.blazebit.common.utils;
+	exports com.blazebit.persistence.spring.data.annotation;
+	exports com.blazebit.persistence.spring.data.base;
+	exports com.blazebit.persistence.spring.data.base.query;
+	exports com.blazebit.persistence.spring.data.base.repository;
+	exports com.blazebit.persistence.spring.data.repository;
+	exports com.blazebit.persistence.spring.data.repository.config;
+}
\ No newline at end of file
diff --git a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/repository/config/BootstrapMode.java b/integration/spring-data/base-3.3/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
deleted file mode 100644
index 1e43e9e27b..0000000000
--- a/integration/spring-data/base-3.3/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2018-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.repository.config;
-
-/**
- * Enumeration to define in which way repositories are bootstrapped.
- *
- * @author Oliver Gierke
- * @see RepositoryConfigurationSource#getBootstrapMode()
- * @since 2.1
- * @soundtrack Dave Matthews Band - She (Come Tomorrow)
- */
-public enum BootstrapMode {
-
-	/**
-	 * Repository proxies are instantiated eagerly, just like any other Spring bean, except explicitly marked as lazy.
-	 * Thus, injection into repository clients will trigger initialization.
-	 */
-	DEFAULT,
-
-	/**
-	 * Repository bean definitions are considered lazy and clients will get repository proxies injected that will
-	 * initialize on first access. Repository initialization is triggered on application context bootstrap completion.
-	 */
-	DEFERRED,
-
-	/**
-	 * Repository bean definitions are considered lazy, lazily inject and only initialized on first use, i.e. the
-	 * application might have fully started without the repositories initialized.
-	 */
-	LAZY;
-}
diff --git a/integration/spring-data/base/pom.xml b/integration/spring-data/base/pom.xml
deleted file mode 100644
index 3fcb0d8fc8..0000000000
--- a/integration/spring-data/base/pom.xml
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data Base</name>
-    <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data</module.name>
-        <spring.activeProfiles />
-        <test.argLine />
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${version.bridge-injector}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- We need a newer version to be compatible with JDK9+ -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>${version.bridge-injector-indexer}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.context;
-                                        requires transitive spring.data.jpa;
-                                        requires transitive com.blazebit.persistence.criteria;
-                                        exports com.blazebit.persistence.spring.data.annotation;
-                                        exports com.blazebit.persistence.spring.data.base;
-                                        exports com.blazebit.persistence.spring.data.base.query;
-                                        exports com.blazebit.persistence.spring.data.base.repository;
-                                        exports com.blazebit.persistence.spring.data.repository;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <processor>org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-annotation</artifactId>
-                        <version>${version.bridge-injector}</version>
-                    </dependency>
-                    <!-- We need a newer version to be compatible with JDK9+ -->
-                    <dependency>
-                        <groupId>org.jenkins-ci</groupId>
-                        <artifactId>annotation-indexer</artifactId>
-                        <version>${version.bridge-injector-indexer}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-injector</artifactId>
-                <version>${version.bridge-injector}</version>
-                <executions>
-                    <execution>
-                        <id>bridge-injector</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Replace the old ASM version by the new one to support JDK9+ -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-debug-all</artifactId>
-                        <version>CUSTOM</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.bridge-injector-asm}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <!--
-                    Disable the creation of bridge methods for this particular profile,
-                    because otherwise we will end up with duplicate methods,
-                    as the normal compilation process would create the necessary bridge methods already.
-                    The bridge methods are only needed in the profile that is used for releasing i.e. the default one,
-                    because we want the artifact to support all spring-data versions.
-                     -->
-                    <plugin>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-injector</artifactId>
-                        <version>${version.bridge-injector}</version>
-                        <executions>
-                            <execution>
-                                <id>bridge-injector</id>
-                                <phase>NONE</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <!--
-                    Disable the creation of bridge methods for this particular profile,
-                    because otherwise we will end up with duplicate methods,
-                    as the normal compilation process would create the necessary bridge methods already.
-                    The bridge methods are only needed in the profile that is used for releasing i.e. the default one,
-                    because we want the artifact to support all spring-data versions.
-                     -->
-                    <plugin>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-injector</artifactId>
-                        <version>${version.bridge-injector}</version>
-                        <executions>
-                            <execution>
-                                <id>bridge-injector</id>
-                                <phase>NONE</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <main.java.version>1.8</main.java.version>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <!--
-                    Disable the creation of bridge methods for this particular profile,
-                    because otherwise we will end up with duplicate methods,
-                    as the normal compilation process would create the necessary bridge methods already.
-                    The bridge methods are only needed in the profile that is used for releasing i.e. the default one,
-                    because we want the artifact to support all spring-data versions.
-                     -->
-                    <plugin>
-                        <groupId>com.infradna.tool</groupId>
-                        <artifactId>bridge-method-injector</artifactId>
-                        <version>${version.bridge-injector}</version>
-                        <executions>
-                            <execution>
-                                <id>bridge-injector</id>
-                                <phase>NONE</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/annotation/OptionalParam.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/annotation/OptionalParam.java
deleted file mode 100644
index 78519f3a83..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/annotation/OptionalParam.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.blazebit.persistence.view.EntityViewSetting;
-
-/**
- * Annotation to let method parameters be bound to the {@link EntityViewSetting}.
- *
- * @author Giovanni Lovato
- * @since 1.3.0
- */
-@Target(ElementType.PARAMETER)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface OptionalParam {
-
-    /**
-     * The name of the parameter.
-     */
-    String value();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/EntityViewSortUtil.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/EntityViewSortUtil.java
deleted file mode 100644
index 61d1cce77c..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/EntityViewSortUtil.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base;
-
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-
-import com.blazebit.persistence.FullQueryBuilder;
-import com.blazebit.persistence.parser.expression.ExpressionFactory;
-import com.blazebit.persistence.parser.expression.PathElementExpression;
-import com.blazebit.persistence.parser.expression.PathExpression;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.persistence.view.metamodel.MethodAttribute;
-import com.blazebit.persistence.view.metamodel.PluralAttribute;
-import com.blazebit.persistence.view.metamodel.SingularAttribute;
-import com.blazebit.persistence.view.metamodel.Type;
-import org.springframework.data.domain.Sort;
-
-/**
- * Utility methods to handle entity view sorting.
- * 
- * @author Moritz Becker
- * @author Giovanni Lovato
- * @since 1.4.0
- */
-
-public final class EntityViewSortUtil {
-
-    private EntityViewSortUtil() {
-    }
-
-    /**
-     * Resolves the deterministic select item alias for an entity view attribute.
-     *
-     * @param viewType entity view type
-     * @param attributePath the absolute attribute path based on the {@code entityViewClass} for which the select alias should be resolved
-     * @return the select item alias for the (nested) entity view attribute targeted by {@code attributePath} or {@code null}
-     * if the {@code attributePath} cannot be resolved
-     */
-    private static String resolveViewAttributeSelectAlias(ManagedViewType<?> viewType, String attributePath) {
-        StringBuilder aliasBuilder = new StringBuilder(viewType.getJavaType().getSimpleName());
-        for (String pathElement : attributePath.split("\\.")) {
-            if (viewType == null) {
-                return null;
-            } else {
-                MethodAttribute<?, ?> attribute = viewType.getAttribute(pathElement);
-                if (attribute == null) {
-                    return null;
-                } else {
-                    aliasBuilder.append('_').append(pathElement);
-                    Type<?> type;
-                    if (attribute instanceof SingularAttribute) {
-                        type = ((SingularAttribute<?, ?>) attribute).getType();
-                    } else {
-                        type = ((PluralAttribute<?, ?, ?>) attribute).getElementType();
-                    }
-                    if (type instanceof ManagedViewType) {
-                        // It's a view type, continue descending
-                        viewType = (ManagedViewType<?>) type;
-                    } else {
-                        // It's a basic type, so we cannot got further
-                        viewType = null;
-                    }
-                }
-            }
-        }
-        return aliasBuilder.toString();
-    }
-
-    public static void applySort(EntityViewManager evm, Class<?> entityViewClass, FullQueryBuilder<?, ?> cb, Sort sort) {
-        ManagedViewType<?> viewType = evm.getMetamodel().managedViewOrError(entityViewClass);
-        for (Sort.Order order : sort) {
-            String entityViewAttributeAlias;
-            if ((entityViewAttributeAlias = EntityViewSortUtil.resolveViewAttributeSelectAlias(viewType, order.getProperty())) == null) {
-                PathExpression pathExpression;
-                try {
-                    pathExpression = cb.getService(ExpressionFactory.class).createPathExpression(order.getProperty());
-                } catch (RuntimeException ex) {
-                    throw new IllegalArgumentException("Sort order [" + order.getProperty() + "] is not resolvable to a path expression.", ex);
-                }
-                javax.persistence.metamodel.Type<?> resultType = cb.getMetamodel().entity(viewType.getEntityClass());
-                for (PathElementExpression expression : pathExpression.getExpressions()) {
-                    if (!(resultType instanceof ManagedType<?>)) {
-                        throw new IllegalArgumentException("Sort order [" + order.getProperty() + "] is not resolvable to a valid path expression, because the type [" + resultType.getJavaType().getName() + "] can't be de-referenced.");
-                    }
-                    ManagedType<?> managedType = (ManagedType<?>) resultType;
-                    Attribute<?, ?> attribute = managedType.getAttribute(expression.toString());
-                    if (!(attribute instanceof javax.persistence.metamodel.SingularAttribute<?, ?>)) {
-                        throw new IllegalArgumentException("Sort order [" + order.getProperty() + "] is not resolvable to a valid path expression, because the type [" + resultType.getJavaType().getName() + "] does not contain a singular attribute named [" + expression + "].");
-                    }
-                    resultType = ( (javax.persistence.metamodel.SingularAttribute<?, ?>) attribute ).getType();
-                }
-                cb.orderBy(order.getProperty(), order.isAscending(), order.getNullHandling() == Sort.NullHandling.NULLS_FIRST);
-            } else {
-                cb.orderBy(entityViewAttributeAlias, order.isAscending(), order.getNullHandling() == Sort.NullHandling.NULLS_FIRST);
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractCriteriaQueryParameterBinder.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractCriteriaQueryParameterBinder.java
deleted file mode 100644
index 882b3f6f10..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractCriteriaQueryParameterBinder.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.type.EntityViewProxy;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaQuery;
-import java.util.Date;
-import java.util.Iterator;
-
-/**
- * Special {@link org.springframework.data.jpa.repository.query.ParameterBinder} to bind {@link CriteriaQuery} parameters. parameters.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 1.x and 2.x.
- * 
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-public abstract class AbstractCriteriaQueryParameterBinder extends ParameterBinder {
-
-    private final EntityManager em;
-    private final EntityViewManager evm;
-    private final Iterator<ParameterMetadataProvider.ParameterMetadata<?>> expressions;
-
-    /**
-     * Creates a new {@link AbstractCriteriaQueryParameterBinder} for the given {@link Parameters}, values and some
-     * {@link javax.persistence.criteria.ParameterExpression}.
-     *
-     * @param parameters must not be {@literal null}.
-     * @param values must not be {@literal null}.
-     * @param expressions must not be {@literal null}.
-     */
-    public AbstractCriteriaQueryParameterBinder(EntityManager em, EntityViewManager evm, JpaParameters parameters, Object[] values, Iterable<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-
-        super(parameters, values);
-
-        Assert.notNull(expressions, "Iterable of ParameterMetadata must not be null!");
-        this.em = em;
-        this.evm = evm;
-        this.expressions = expressions.iterator();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.jpa.repository.query.ParameterBinder#bind(javax.persistence.Query, org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter, java.lang.Object, int)
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void bind(Query query, JpaParameters.JpaParameter parameter, Object value, int position) {
-
-        ParameterMetadataProvider.ParameterMetadata<Object> metadata = (ParameterMetadataProvider.ParameterMetadata<Object>) expressions.next();
-
-        if (metadata.isIsNullParameter()) {
-            return;
-        }
-        Object paramValue = metadata.prepare(value);
-
-        // Christian Beikov: Parameters are now set by name or position instead of by the ParameterExpression object if possible
-        if (parameter.isTemporalParameter()) {
-            if (metadata.getExpression().getPosition() == null) {
-                if (metadata.getExpression().getName() == null) {
-                    query.setParameter((Parameter) metadata.getExpression(), (Date) paramValue,
-                            parameter.getTemporalType());
-                } else {
-                    query.setParameter(metadata.getExpression().getName(), (Date) paramValue,
-                            parameter.getTemporalType());
-                }
-            } else {
-                query.setParameter(metadata.getExpression().getPosition(), (Date) paramValue,
-                        parameter.getTemporalType());
-            }
-        } else {
-            if (paramValue instanceof EntityViewProxy) {
-                paramValue = evm.getEntityReference(em, paramValue);
-            }
-            if (metadata.getExpression().getPosition() == null) {
-                if (metadata.getExpression().getName() == null) {
-                    query.setParameter(metadata.getExpression(), paramValue);
-                } else {
-                    query.setParameter(metadata.getExpression().getName(), paramValue);
-                }
-            } else {
-                query.setParameter(metadata.getExpression().getPosition(), paramValue);
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
deleted file mode 100644
index 20f250878a..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/AbstractPartTreeBlazePersistenceQuery.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Copyright 2014 - 2024 Blazebit.
- * Copyright 2010-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.FullQueryBuilder;
-import com.blazebit.persistence.OrderByBuilder;
-import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteria;
-import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteriaQuery;
-import com.blazebit.persistence.spring.data.base.EntityViewSortUtil;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters.JpaParameter;
-import com.blazebit.persistence.spring.data.repository.BlazeSpecification;
-import com.blazebit.persistence.spring.data.repository.EntityViewSettingProcessor;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.Sorter;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.provider.PersistenceProvider;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.FixedJpaCountQueryCreator;
-import org.springframework.data.jpa.repository.query.FixedJpaQueryCreator;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.PartTreeJpaQuery;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Implementation is similar to {@link PartTreeJpaQuery} but was modified to work with entity views.
- *
- * About sorting
- * The implementation of both {@link AbstractPartTreeBlazePersistenceQuery} and {@link com.blazebit.persistence.spring.data.base.repository.AbstractEntityViewAwareRepository}
- * aims to support mixed sorting, i.e. sorting by entity view attributes and entity attributes at the same time.
- * To make this work we abstain from using the attribute sorter API of {@link EntityViewSetting} because it would not
- * allow us to add the entity attribute sorts. Instead, we add both entity view attribute and entity attribute sorters
- * uniformly via the core order API of {@link OrderByBuilder} *after* the entity view settings have been applied:
- *   - For entity view attribute sorts we resolve deterministic aliases from the order property that correspond to the
- *     select item aliases
- *   - For entity attribute sorts we just use the order property as is
- *
- * Sorters are retrieved from 4 sources. The order these sources are applied to the final query is as follows:
- *   1. method name sorters e.g. findAllByOrderByNameAsc()
- *   2./3. {@link Pageable} or {@link Sort} method parameter
- *   4. {@link EntityViewSettingProcessor} method parameter that adds attribute sorters to the entity view settings
- *
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public abstract class AbstractPartTreeBlazePersistenceQuery extends AbstractJpaQuery {
-
-    private static final String QUERY_PATTERN = "find|read|get|query|stream";
-    private static final String COUNT_PATTERN = "count";
-    private static final String EXISTS_PATTERN = "exists";
-    private static final String DELETE_PATTERN = "delete|remove";
-    private static final Pattern PREFIX_TEMPLATE = Pattern.compile( //
-                    "^(" + QUERY_PATTERN + "|" + COUNT_PATTERN + "|" + EXISTS_PATTERN + "|" + DELETE_PATTERN + ")((\\p{Lu}.*?))??By");
-
-    private final EntityViewAwareJpaQueryMethod method;
-    private final Class<?> domainClass;
-    private final Class<?> entityViewClass;
-    private final PartTree tree;
-    private final JpaParameters parameters;
-
-    private final AbstractPartTreeBlazePersistenceQuery.QueryPreparer query;
-    private final CriteriaBuilderFactory cbf;
-    private final Object escape;
-    protected final EntityViewManager evm;
-
-    public AbstractPartTreeBlazePersistenceQuery(EntityViewAwareJpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, Object escape, CriteriaBuilderFactory cbf, EntityViewManager evm) {
-
-        super(method, em);
-
-        this.method = method;
-        this.escape = escape;
-        this.cbf = cbf;
-        this.evm = evm;
-
-        this.entityViewClass = method.getEntityViewClass();
-        this.domainClass = method.getEntityInformation().getJavaType();
-
-        this.parameters = method.getJpaParameters();
-        String methodName = method.getName();
-        boolean skipMethodNamePredicateMatching = !PREFIX_TEMPLATE.matcher(methodName).find();
-        String source = skipMethodNamePredicateMatching ? "" : methodName;
-        this.tree = new PartTree(source, domainClass);
-
-        boolean hasEntityViewSettingProcessorParameter = parameters.hasEntityViewSettingProcessorParameter();
-        boolean hasSpecificationParameter = parameters.hasSpecificationParameter();
-        boolean hasCriteriaBuilderProcessorParameter = parameters.hasBlazeSpecificationParameter();
-        boolean recreateQueries = parameters.hasDynamicProjection() || parameters.potentiallySortsDynamically()
-                || entityViewClass != null
-                || skipMethodNamePredicateMatching
-                || hasEntityViewSettingProcessorParameter
-                || hasSpecificationParameter
-                || hasCriteriaBuilderProcessorParameter;
-        this.query = isCountProjection(tree) ? new AbstractPartTreeBlazePersistenceQuery.CountQueryPreparer(persistenceProvider,
-            recreateQueries) : new AbstractPartTreeBlazePersistenceQuery.QueryPreparer(persistenceProvider, recreateQueries);
-    }
-
-    protected abstract ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, ParametersParameterAccessor accessor, PersistenceProvider provider, Object escape);
-
-    protected abstract ParameterMetadataProvider createParameterMetadataProvider(CriteriaBuilder builder, JpaParameters parameters, PersistenceProvider provider, Object escape);
-
-    protected abstract boolean isCountProjection(PartTree tree);
-
-    protected boolean isDelete() {
-        return isDelete(this.tree);
-    }
-
-    protected boolean isExists() {
-        return isExists(this.tree);
-    }
-
-    protected abstract boolean isDelete(PartTree tree);
-
-    protected abstract boolean isExists(PartTree tree);
-
-    protected abstract int getOffset(Pageable pageable);
-
-    protected abstract int getLimit(Pageable pageable);
-
-    protected abstract ParameterBinder createCriteriaQueryParameterBinder(JpaParameters parameters, Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions);
-
-    protected abstract Map<String, Object> tryGetFetchGraphHints(JpaEntityGraph entityGraph, Class<?> entityType);
-
-    public Query doCreateQuery(Object[] values) {
-        return query.createQuery(values);
-    }
-
-    public Query createPaginatedQuery(Object[] values, boolean withCount) {
-        Query paginatedQuery = query.createPaginatedQuery(values, withCount);
-        if (method.getLockModeType() != null) {
-            paginatedQuery.setLockMode(method.getLockModeType());
-        }
-
-        JpaEntityGraph entityGraph = method.getEntityGraph();
-        if (entityGraph != null) {
-            Map<String, Object> hints = tryGetFetchGraphHints(method.getEntityGraph(), this.getQueryMethod().getEntityInformation().getJavaType());
-            for (Map.Entry<String, Object> entry : hints.entrySet()) {
-                paginatedQuery.setHint(entry.getKey(), entry.getValue());
-            }
-        }
-        Map<String, String> hints = method.getHints();
-        if (!hints.isEmpty()) {
-            for (Map.Entry<String, String> entry : hints.entrySet()) {
-                paginatedQuery.setHint(entry.getKey(), entry.getValue());
-            }
-        }
-        return paginatedQuery;
-    }
-
-    public TypedQuery<Long> doCreateCountQuery(Object[] values) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Query preparer to create {@link CriteriaQuery} instances and potentially cache them.
-     *
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     */
-    private class QueryPreparer {
-
-        private final CriteriaQuery<?> cachedCriteriaQuery;
-        private final List<ParameterMetadataProvider.ParameterMetadata<?>> expressions;
-        private final PersistenceProvider persistenceProvider;
-
-        public QueryPreparer(PersistenceProvider persistenceProvider, boolean recreateQueries) {
-
-            this.persistenceProvider = persistenceProvider;
-
-            FixedJpaQueryCreator creator = createCreator(null, persistenceProvider);
-
-            this.cachedCriteriaQuery = recreateQueries ? null : invokeQueryCreator(creator, null);
-            this.expressions = recreateQueries ? null : creator.getParameterExpressions();
-        }
-
-        /******************************************
-         * Moritz Becker, Christian Beikov:
-         * The following methods were modified to work with entity views.
-         ******************************************/
-        private TypedQuery<?> createQuery(CriteriaQuery<?> criteriaQuery, Object[] values) {
-            if (this.cachedCriteriaQuery != null) {
-                synchronized (this.cachedCriteriaQuery) {
-                    return createQuery0(criteriaQuery, values);
-                }
-            }
-            return createQuery0(criteriaQuery, values);
-        }
-
-        protected TypedQuery<?> createQuery0(CriteriaQuery<?> criteriaQuery, Object[] values) {
-            processSpecification(criteriaQuery, values);
-
-            com.blazebit.persistence.CriteriaBuilder<?> cb = ((BlazeCriteriaQuery<?>) criteriaQuery).createCriteriaBuilder(getEntityManager());
-
-            processBlazeSpecification(cb, values);
-
-            Class<?> entityViewClass = AbstractPartTreeBlazePersistenceQuery.this.entityViewClass;
-            if (parameters.hasDynamicProjection()) {
-                // If the dynamic projection is an entity view, we use that and null it for the result processor
-                entityViewClass = (Class<?>) values[parameters.getDynamicProjectionIndex()];
-                if (evm.getMetamodel().managedView(entityViewClass) == null) {
-                    entityViewClass = null;
-                } else {
-                    values[parameters.getDynamicProjectionIndex()] = null;
-                }
-            }
-            if (entityViewClass == null) {
-                return cb.getQuery();
-            } else {
-                EntityViewSetting<?, ?> setting = EntityViewSetting.create(entityViewClass);
-                // the entity view processor may append attribute sorters to the settings
-                setting = processSetting(setting, values);
-                // we do not want to apply the sorters during evm.applySetting so we extract them here for later application
-                // in order to maintain the defined order of sort applications
-                Map<String, Sorter> settingProcessorAttributeSorters = new HashMap<>(setting.getAttributeSorters());
-                setting.getAttributeSorters().clear();
-                FullQueryBuilder<?, ?> fqb = evm.applySetting(setting, cb);
-                processSort(fqb, values, entityViewClass, settingProcessorAttributeSorters);
-                return fqb.getQuery();
-            }
-        }
-
-        Query createPaginatedQuery(Object[] values, boolean withCount) {
-            CriteriaQuery<?> criteriaQuery = cachedCriteriaQuery;
-            List<ParameterMetadataProvider.ParameterMetadata<?>> expressions = this.expressions;
-            ParametersParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-
-            if (cachedCriteriaQuery == null || accessor.hasBindableNullValue()) {
-                FixedJpaQueryCreator creator = createCreator(accessor, persistenceProvider);
-                criteriaQuery = invokeQueryCreator(creator, appliesSortThroughAttributeSorters() ? null : getDynamicSort(values));
-                expressions = creator.getParameterExpressions();
-            }
-
-            processSpecification(criteriaQuery, values);
-
-            com.blazebit.persistence.CriteriaBuilder<?> cb = ((BlazeCriteriaQuery<?>) criteriaQuery).createCriteriaBuilder(getEntityManager());
-
-            processBlazeSpecification(cb, values);
-
-            TypedQuery<Object> jpaQuery;
-            ParameterBinder binder = getBinder(values, expressions);
-            int firstResult = getOffset(binder.getPageable());
-            int maxResults = getLimit(binder.getPageable());
-            Class<?> entityViewClass = AbstractPartTreeBlazePersistenceQuery.this.entityViewClass;
-            if (parameters.hasDynamicProjection()) {
-                // If the dynamic projection is an entity view, we use that and null it for the result processor
-                entityViewClass = (Class<?>) values[parameters.getDynamicProjectionIndex()];
-                if (evm.getMetamodel().managedView(entityViewClass) == null) {
-                    entityViewClass = null;
-                } else {
-                    values[parameters.getDynamicProjectionIndex()] = null;
-                }
-            }
-
-            boolean withKeysetExtraction = false;
-            boolean withExtractAllKeysets = false;
-            Pageable pageable = binder.getPageable();
-            if (!withCount) {
-                maxResults++;
-            }
-
-            if (entityViewClass == null) {
-                PaginatedCriteriaBuilder<Object> paginatedCriteriaBuilder;
-                if (pageable instanceof KeysetPageable) {
-                    KeysetPageable keysetPageable = (KeysetPageable) pageable;
-                    paginatedCriteriaBuilder = (PaginatedCriteriaBuilder<Object>) cb.page(keysetPageable.getKeysetPage(), firstResult, maxResults);
-                    withKeysetExtraction = true;
-                    withExtractAllKeysets = keysetPageable.isWithExtractAllKeysets();
-                } else {
-                    paginatedCriteriaBuilder = (PaginatedCriteriaBuilder<Object>) cb.page(firstResult, maxResults);
-                }
-                if (withKeysetExtraction) {
-                    paginatedCriteriaBuilder.withKeysetExtraction(true);
-                    paginatedCriteriaBuilder.withExtractAllKeysets(withExtractAllKeysets);
-                }
-                if (withCount) {
-                    paginatedCriteriaBuilder.withCountQuery(true);
-                } else {
-                    paginatedCriteriaBuilder.withHighestKeysetOffset(1).withCountQuery(false);
-                }
-                jpaQuery = paginatedCriteriaBuilder.getQuery();
-            } else {
-                EntityViewSetting<?, ?> setting = EntityViewSetting.create(entityViewClass, firstResult, maxResults);
-                if (pageable instanceof KeysetPageable) {
-                    KeysetPageable keysetPageable = (KeysetPageable) pageable;
-                    withKeysetExtraction = true;
-                    withExtractAllKeysets = keysetPageable.isWithExtractAllKeysets();
-                    setting.withKeysetPage(keysetPageable.getKeysetPage());
-                }
-                setting = processSetting(setting, values);
-                Map<String, Sorter> settingProcessorAttributeSorters = new HashMap<>(setting.getAttributeSorters());
-                setting.getAttributeSorters().clear();
-                PaginatedCriteriaBuilder<Object> paginatedCriteriaBuilder = (PaginatedCriteriaBuilder<Object>) evm.applySetting(setting, cb);
-                processSort(paginatedCriteriaBuilder, values, entityViewClass, settingProcessorAttributeSorters);
-                if (withCount) {
-                    paginatedCriteriaBuilder.withCountQuery(true);
-                } else {
-                    paginatedCriteriaBuilder.withHighestKeysetOffset(1).withCountQuery(false);
-                }
-                if (withKeysetExtraction) {
-                    paginatedCriteriaBuilder.withKeysetExtraction(true);
-                    paginatedCriteriaBuilder.withExtractAllKeysets(withExtractAllKeysets);
-                }
-                jpaQuery = paginatedCriteriaBuilder.getQuery();
-            }
-
-            // Just bind the parameters, not the pagination information
-            return binder.bind(jpaQuery);
-        }
-
-        @SuppressWarnings("unchecked")
-        protected <T> EntityViewSetting<? extends T, ?> processSetting(EntityViewSetting<T, ?> setting, Object[] values) {
-            EntityViewSetting<? extends T, ?> processedSetting = setting;
-            int entityViewSettingProcessorIndex = parameters.getEntityViewSettingProcessorIndex();
-            if (entityViewSettingProcessorIndex >= 0) {
-                EntityViewSettingProcessor<T> processor = (EntityViewSettingProcessor<T>) values[entityViewSettingProcessorIndex];
-                if (processor != null) {
-                    processedSetting = processor.acceptEntityViewSetting(setting);
-                }
-            }
-            for (JpaParameter parameter : parameters.getOptionalParameters()) {
-                String parameterName = parameter.getParameterName();
-                Object parameterValue = values[parameter.getIndex()];
-                processedSetting.addOptionalParameter(parameterName, parameterValue);
-            }
-            return processedSetting;
-        }
-
-        protected void processSort(FullQueryBuilder<?, ?> cb, Object[] values, Class<?> entityViewClass, Map<String, Sorter> evsAttributeSorter) {
-            Sort sort;
-            int sortIndex;
-            int pageableIndex;
-            if ((sortIndex = parameters.getSortIndex()) >= 0 && (sort = (Sort) values[sortIndex]) != null) {
-                EntityViewSortUtil.applySort(evm, entityViewClass, cb, sort);
-            } else if ((pageableIndex = parameters.getPageableIndex()) >= 0 && (sort = ((Pageable) values[pageableIndex]).getSort()) != null) {
-                EntityViewSortUtil.applySort(evm, entityViewClass, cb, sort);
-            }
-            for (Map.Entry<String, Sorter> attributeSorterEntry : evsAttributeSorter.entrySet()) {
-                attributeSorterEntry.getValue().apply((OrderByBuilder) cb, attributeSorterEntry.getKey());
-            }
-        }
-
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        protected void processSpecification(CriteriaQuery<?> criteriaQuery, Object[] values) {
-            BlazeCriteriaQuery<?> blazeCriteriaQuery = (BlazeCriteriaQuery<?>) criteriaQuery;
-            int specificationIndex = parameters.getSpecificationIndex();
-            if (specificationIndex >= 0) {
-                Specification<?> specification = (Specification<?>) values[specificationIndex];
-                if (specification != null) {
-                    Root root = criteriaQuery.getRoots().iterator().next();
-                    BlazeCriteriaBuilder criteriaBuilder = blazeCriteriaQuery.getCriteriaBuilder();
-                    Predicate predicate = specification.toPredicate(root, criteriaQuery, criteriaBuilder);
-                    criteriaQuery.where(predicate);
-                }
-            }
-        }
-
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        protected void processBlazeSpecification(com.blazebit.persistence.CriteriaBuilder<?> criteriaBuilder, Object[] values) {
-            int criteriaBuilderProcessorIndex = parameters.getBlazeSpecificationIndex();
-            if (criteriaBuilderProcessorIndex >= 0) {
-                String rootAlias = criteriaBuilder.getRoots().iterator().next().getAlias();
-                BlazeSpecification blazeSpecification = (BlazeSpecification) values[criteriaBuilderProcessorIndex];
-                if (blazeSpecification != null) {
-                    blazeSpecification.applySpecification(rootAlias, criteriaBuilder);
-                }
-            }
-        }
-
-        protected FixedJpaQueryCreator createCreator(ParametersParameterAccessor accessor,
-                                                     PersistenceProvider persistenceProvider) {
-            BlazeCriteriaQuery<Long> cq = BlazeCriteria.get(cbf, Long.class);
-            CriteriaBuilder builder = cq.getCriteriaBuilder();
-
-            ParameterMetadataProvider provider = accessor == null
-                    ? createParameterMetadataProvider(builder, parameters, persistenceProvider, escape)
-                    : createParameterMetadataProvider(builder, accessor, persistenceProvider, escape);
-
-            return new FixedJpaQueryCreator(tree, domainClass, builder, provider);
-        }
-        /******************************************
-         * end of changes
-         ******************************************/
-
-        /**
-         * Creates a new {@link Query} for the given parameter values.
-         *
-         * @param values
-         * @return
-         */
-        public Query createQuery(Object[] values) {
-            CriteriaQuery<?> criteriaQuery = cachedCriteriaQuery;
-            List<ParameterMetadataProvider.ParameterMetadata<?>> expressions = this.expressions;
-            ParametersParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
-
-            if (cachedCriteriaQuery == null || accessor.hasBindableNullValue()) {
-                FixedJpaQueryCreator creator = createCreator(accessor, persistenceProvider);
-                criteriaQuery = invokeQueryCreator(creator, appliesSortThroughAttributeSorters() ? null : getDynamicSort(values));
-                expressions = creator.getParameterExpressions();
-            }
-
-            TypedQuery<?> jpaQuery = createQuery(criteriaQuery, values);
-
-            return restrictMaxResultsIfNecessary(invokeBinding(getBinder(values, expressions), jpaQuery));
-        }
-
-        private boolean appliesSortThroughAttributeSorters() {
-            return entityViewClass != null || parameters.hasDynamicProjection();
-        }
-
-        protected CriteriaQuery<?> invokeQueryCreator(FixedJpaQueryCreator creator, Sort sort) {
-            if (sort == null) {
-                return creator.createQuery().select(null);
-            } else {
-                return creator.createQuery(sort).select(null);
-            }
-        }
-
-        /**
-         * Restricts the max results of the given {@link Query} if the current {@code tree} marks this {@code query} as
-         * limited.
-         *
-         * @param query
-         * @return
-         */
-        private Query restrictMaxResultsIfNecessary(Query query) {
-            if (tree.isLimiting()) {
-                if (query.getMaxResults() != Integer.MAX_VALUE) {
-                    /*
-                     * In order to return the correct results, we have to adjust the first result offset to be returned if:
-                     * - a Pageable parameter is present
-                     * - AND the requested page number > 0
-                     * - AND the requested page size was bigger than the derived result limitation via the First/Top keyword.
-                     */
-                    if (query.getMaxResults() > tree.getMaxResults() && query.getFirstResult() > 0) {
-                        query.setFirstResult(query.getFirstResult() - (query.getMaxResults() - tree.getMaxResults()));
-                    }
-                }
-
-                query.setMaxResults(tree.getMaxResults());
-            }
-
-            return query;
-        }
-
-        /**
-         * Invokes parameter binding on the given {@link TypedQuery}.
-         *
-         * @param binder
-         * @param query
-         * @return
-         */
-        protected Query invokeBinding(ParameterBinder binder, TypedQuery<?> query) {
-            return binder.bindAndPrepare(query);
-        }
-
-        private ParameterBinder getBinder(Object[] values, List<ParameterMetadataProvider.ParameterMetadata<?>> expressions) {
-            return createCriteriaQueryParameterBinder(parameters, values, expressions);
-        }
-
-        private Sort getDynamicSort(Object[] values) {
-            return parameters.potentiallySortsDynamically() ? new ParametersParameterAccessor(parameters, values).getSort()
-                    : null;
-        }
-    }
-
-    /**
-     * Special {@link PartTreeJpaQuery.QueryPreparer} to create count queries.
-     *
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     */
-    private class CountQueryPreparer extends AbstractPartTreeBlazePersistenceQuery.QueryPreparer {
-
-        public CountQueryPreparer(PersistenceProvider persistenceProvider, boolean recreateQueries) {
-            super(persistenceProvider, recreateQueries);
-        }
-
-        @Override
-        protected FixedJpaQueryCreator createCreator(ParametersParameterAccessor accessor,
-                                                PersistenceProvider persistenceProvider) {
-
-            EntityManager entityManager = getEntityManager();
-            CriteriaBuilder builder = entityManager.getCriteriaBuilder();
-
-            ParameterMetadataProvider provider = accessor == null
-                    ? createParameterMetadataProvider(builder, parameters, persistenceProvider, escape)
-                    : createParameterMetadataProvider(builder, accessor, persistenceProvider, escape);
-
-            return new FixedJpaCountQueryCreator(tree, domainClass, builder, provider);
-        }
-
-        /**
-         * Customizes binding by skipping the pagination.
-         *
-         * @see AbstractPartTreeBlazePersistenceQuery.QueryPreparer#invokeBinding(ParameterBinder,
-         *      javax.persistence.TypedQuery)
-         */
-        @Override
-        protected Query invokeBinding(ParameterBinder binder, javax.persistence.TypedQuery<?> query) {
-            return binder.bind(query);
-        }
-
-        @Override
-        protected TypedQuery<?> createQuery0(CriteriaQuery<?> criteriaQuery, Object[] values) {
-            return getEntityManager().createQuery(criteriaQuery);
-        }
-
-        @Override
-        protected CriteriaQuery<?> invokeQueryCreator(FixedJpaQueryCreator creator, Sort sort) {
-            return creator.createQuery();
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareJpaQueryMethod.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareJpaQueryMethod.java
deleted file mode 100644
index 62ebeb68f7..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareJpaQueryMethod.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.query;
-
-import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.jpa.provider.QueryExtractor;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Lock;
-import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.JpaQueryMethod;
-import org.springframework.data.projection.ProjectionFactory;
-
-import javax.persistence.LockModeType;
-import javax.persistence.QueryHint;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareJpaQueryMethod extends JpaQueryMethod {
-
-    private final Class<?> entityViewClass;
-    private final JpaParameters parameters;
-    private final LockModeType lockModeType;
-    private final JpaEntityGraph entityGraph;
-    private final Map<String, String> queryHints;
-
-    /**
-     * Creates a {@link JpaQueryMethod}.
-     *
-     * @param method must not be {@literal null}
-     * @param extractor must not be {@literal null}
-     * @param metadata must not be {@literal null}
-     */
-    public EntityViewAwareJpaQueryMethod(Method method, EntityViewAwareRepositoryMetadata metadata, ProjectionFactory factory,
-                          QueryExtractor extractor) {
-
-        super(method, metadata, factory, extractor);
-        this.lockModeType = findLockModeType(method);
-        this.entityGraph = findEntityGraph(method);
-        this.queryHints = findQueryHints(method);
-        this.entityViewClass = metadata.getReturnedEntityViewClass(method);
-        this.parameters = new JpaParameters(method);
-    }
-
-    public LockModeType getLockModeType() {
-        return lockModeType;
-    }
-
-    public JpaEntityGraph getEntityGraph() {
-        return entityGraph;
-    }
-
-    public Map<String, String> getHints() {
-        return queryHints;
-    }
-
-    public boolean isEntityViewQuery() {
-        return entityViewClass != null;
-    }
-
-    public Class<?> getEntityViewClass() {
-        return entityViewClass;
-    }
-
-    public JpaParameters getJpaParameters() {
-        return parameters;
-    }
-
-    private JpaEntityGraph findEntityGraph(Method method) {
-        EntityGraph entityGraph = AnnotatedElementUtils.findMergedAnnotation(method, EntityGraph.class);
-        return entityGraph == null ? null : new JpaEntityGraph(entityGraph, this.getNamedQueryName());
-    }
-
-    private LockModeType findLockModeType(Method method) {
-        Lock annotation = AnnotatedElementUtils.findMergedAnnotation(method, Lock.class);
-        return annotation == null ? null : (LockModeType) AnnotationUtils.getValue(annotation);
-    }
-
-    private Map<String, String> findQueryHints(Method method) {
-        Map<String, String> queryHints = new HashMap<>();
-        QueryHints queryHintsAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, QueryHints.class);
-
-        if (queryHintsAnnotation != null) {
-
-            for (QueryHint hint : queryHintsAnnotation.value()) {
-                queryHints.put(hint.name(), hint.value());
-            }
-        }
-
-        QueryHint queryHintAnnotation = AnnotationUtils.findAnnotation(method, QueryHint.class);
-
-        if (queryHintAnnotation != null) {
-            queryHints.put(queryHintAnnotation.name(), queryHintAnnotation.value());
-        }
-
-        return Collections.unmodifiableMap(queryHints);
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareRepositoryMetadata.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareRepositoryMetadata.java
deleted file mode 100644
index ed78cf61b5..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/EntityViewAwareRepositoryMetadata.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.data.repository.core.RepositoryMetadata;
-
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface EntityViewAwareRepositoryMetadata extends RepositoryMetadata {
-
-    public EntityViewManager getEntityViewManager();
-
-    public Class<?> getEntityViewType();
-
-    public Class<?> getReturnedEntityViewClass(Method method);
-
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/JpaParameters.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/JpaParameters.java
deleted file mode 100644
index 8039b516ac..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/JpaParameters.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2013-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.spring.data.annotation.OptionalParam;
-import com.blazebit.persistence.spring.data.base.query.JpaParameters.JpaParameter;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import org.springframework.core.MethodParameter;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.Temporal;
-
-import com.blazebit.persistence.spring.data.repository.EntityViewSettingProcessor;
-import com.blazebit.persistence.spring.data.repository.BlazeSpecification;
-
-import org.springframework.data.repository.query.Param;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-
-import javax.persistence.TemporalType;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Custom extension of {@link Parameters} discovering additional query parameter annotations.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 1.x and 2.x.
- * 
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-public class JpaParameters extends Parameters<JpaParameters, JpaParameter> {
-
-    private final int keysetPageableIndex;
-
-    /**
-     * Creates a new {@link JpaParameters} instance from the given {@link Method}.
-     *
-     * @param method must not be {@literal null}.
-     */
-    public JpaParameters(Method method) {
-        super(method);
-        if (super.hasPageableParameter()) {
-            this.keysetPageableIndex = -1;
-        } else {
-            Class<?>[] types = method.getParameterTypes();
-            int i = 0;
-            for (; i < types.length; i++) {
-                if (types[i] == KeysetPageable.class) {
-                    break;
-                }
-            }
-            if (i == types.length) {
-                this.keysetPageableIndex = -1;
-            } else {
-                this.keysetPageableIndex = i;
-            }
-        }
-    }
-
-    private JpaParameters(List<JpaParameter> parameters) {
-        super(parameters);
-        if (super.hasPageableParameter()) {
-            this.keysetPageableIndex = -1;
-        } else {
-            int i = 0;
-            for (; i < parameters.size(); i++) {
-                JpaParameter jpaParameter = parameters.get(i);
-                if (jpaParameter.getType() == KeysetPageable.class) {
-                    break;
-                }
-            }
-            if (i == parameters.size()) {
-                this.keysetPageableIndex = -1;
-            } else {
-                this.keysetPageableIndex = i;
-            }
-        }
-    }
-
-    @Override
-    public boolean hasPageableParameter() {
-        return this.keysetPageableIndex != -1 || super.hasPageableParameter();
-    }
-
-    @Override
-    public int getPageableIndex() {
-        return keysetPageableIndex == -1 ? super.getPageableIndex() : keysetPageableIndex;
-    }
-
-    /**
-     * Gets the parameters annotated with {@link OptionalParam}.
-     *
-     * @return the optional parameters
-     */
-    public JpaParameters getOptionalParameters() {
-
-        List<JpaParameter> parameters = new ArrayList<>();
-
-        for (JpaParameter candidate : this) {
-            if (candidate.isOptionalParameter()) {
-                parameters.add(candidate);
-            }
-        }
-
-        return createFrom(parameters);
-    }
-
-    /**
-     * Returns the index of the {@link Specification} {@link Method} parameter if available. Will return {@literal -1} if there
-     * is no {@link Specification} parameter in the {@link Method}'s parameter list.
-     *
-     * @return the index of the specification parameter, or -1 if not present
-     */
-    public int getSpecificationIndex() {
-        int index = 0;
-
-        for (JpaParameter candidate : this) {
-            if (candidate.isSpecificationParameter()) {
-                return index;
-            }
-            ++index;
-        }
-
-        return -1;
-    }
-
-    /**
-     * Returns whether the method the {@link Parameters} was created for contains a {@link Specification} parameter.
-     *
-     * @return true if the methods has a specification parameter
-     */
-    public boolean hasSpecificationParameter() {
-        return getSpecificationIndex() >= 0;
-    }
-
-    /**
-     * Returns the index of the {@link EntityViewSettingProcessor} {@link Method} parameter if available. Will return
-     * {@literal -1} if there is no {@link EntityViewSettingProcessor} parameter in the {@link Method}'s parameter list.
-     *
-     * @return the index of the processor parameter, or -1 if not present
-     */
-    public int getEntityViewSettingProcessorIndex() {
-        int index = 0;
-
-        for (JpaParameter candidate : this) {
-            if (candidate.isEntityViewSettingProcessorParameter()) {
-                return index;
-            }
-            ++index;
-        }
-
-        return -1;
-    }
-
-    /**
-     * Returns whether the method the {@link Parameters} was created for contains a {@link EntityViewSettingProcessor}
-     * parameter.
-     *
-     * @return true if the methods has a processor parameter
-     */
-    public boolean hasEntityViewSettingProcessorParameter() {
-        return getEntityViewSettingProcessorIndex() >= 0;
-    }
-
-    /**
-     * Returns the index of the {@link BlazeSpecification} {@link Method} parameter if available. Will return
-     * {@literal -1} if there is no {@link BlazeSpecification} parameter in the {@link Method}'s parameter list.
-     *
-     * @return the index of the processor parameter, or -1 if not present
-     */
-    public int getBlazeSpecificationIndex() {
-        int index = 0;
-
-        for (JpaParameter candidate : this) {
-            if (candidate.isBlazeSpecificationParameter()) {
-                return index;
-            }
-            ++index;
-        }
-
-        return -1;
-    }
-
-    /**
-     * Returns whether the method the {@link Parameters} was created for contains a {@link BlazeSpecification}
-     * parameter.
-     *
-     * @return true if the methods has a processor parameter
-     */
-    public boolean hasBlazeSpecificationParameter() {
-        return getBlazeSpecificationIndex() >= 0;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.Parameters#createParameter(org.springframework.core.MethodParameter)
-     */
-    @Override
-    protected JpaParameter createParameter(MethodParameter parameter) {
-        return new JpaParameter(parameter);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.query.Parameters#createFrom(java.util.List)
-     */
-    @Override
-    protected JpaParameters createFrom(List<JpaParameter> parameters) {
-        return new JpaParameters(parameters);
-    }
-
-    /**
-     * Custom {@link Parameter} implementation adding parameters of type {@link Temporal} to the special ones.
-     *
-     * @author Thomas Darimont
-     * @author Oliver Gierke
-     */
-    public static class JpaParameter extends Parameter {
-
-        private final MethodParameter parameter;
-        private final OptionalParam optional;
-        private final Temporal annotation;
-        private TemporalType temporalType;
-
-        /**
-         * Creates a new {@link JpaParameter}.
-         *
-         * @param parameter must not be {@literal null}.
-         */
-        JpaParameter(MethodParameter parameter) {
-
-            super(parameter);
-
-            this.parameter = parameter;
-            this.optional = parameter.getParameterAnnotation(OptionalParam.class);
-            this.annotation = parameter.getParameterAnnotation(Temporal.class);
-            this.temporalType = null;
-
-            if (!isDateParameter() && hasTemporalParamAnnotation()) {
-                throw new IllegalArgumentException(
-                    Temporal.class.getSimpleName() + " annotation is only allowed on Date parameter!");
-            }
-        }
-
-        public String getParameterName() {
-            Param annotation = parameter.getParameterAnnotation(Param.class);
-            if (annotation != null) {
-                return annotation.value();
-            }
-            return optional == null ? parameter.getParameterName() : optional.value();
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.repository.query.Parameter#isBindable()
-         */
-        @Override
-        public boolean isBindable() {
-            return super.isBindable() || isTemporalParameter();
-        }
-
-        @Override
-        public boolean isSpecialParameter() {
-            return super.isSpecialParameter() || isOptionalParameter() || isSpecificationParameter()
-                    || isEntityViewSettingProcessorParameter()
-                    || isBlazeSpecificationParameter();
-        }
-
-        boolean isOptionalParameter() {
-            return optional != null;
-        }
-
-        boolean isSpecificationParameter() {
-            return Specification.class.isAssignableFrom(parameter.getParameterType());
-        }
-
-        boolean isEntityViewSettingProcessorParameter() {
-            return EntityViewSettingProcessor.class.isAssignableFrom(parameter.getParameterType());
-        }
-
-        boolean isBlazeSpecificationParameter() {
-            return BlazeSpecification.class.isAssignableFrom(parameter.getParameterType());
-        }
-
-        /**
-         * @return {@literal true} if this parameter is of type {@link Date} and has an {@link Temporal} annotation.
-         */
-        boolean isTemporalParameter() {
-            return isDateParameter() && hasTemporalParamAnnotation();
-        }
-
-        /**
-         * @return the {@link TemporalType} on the {@link Temporal} annotation of the given {@link Parameter}.
-         */
-        TemporalType getTemporalType() {
-
-            if (temporalType == null) {
-                this.temporalType = annotation == null ? null : annotation.value();
-            }
-
-            return this.temporalType;
-        }
-
-        /**
-         * @return the required {@link TemporalType} on the {@link Temporal} annotation of the given {@link Parameter}.
-         * @throws IllegalStateException if the parameter does not define a {@link TemporalType}.
-         * @since 2.0
-         */
-        TemporalType getRequiredTemporalType() throws IllegalStateException {
-
-            TemporalType temporalType = getTemporalType();
-
-            if (temporalType != null) {
-                return temporalType;
-            }
-
-            throw new IllegalStateException(String.format("Required temporal type not found for %s!", getType()));
-        }
-
-        private boolean hasTemporalParamAnnotation() {
-            return annotation != null;
-        }
-
-        private boolean isDateParameter() {
-            return getType().equals(Date.class);
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
deleted file mode 100644
index 90b16fa43c..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.KeysetPage;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
-import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class KeysetAwarePageImpl<T> extends PageImpl<T> implements KeysetAwarePage<T> {
-
-    private final KeysetPage keysetPage;
-
-    public KeysetAwarePageImpl(List<T> list) {
-        super(list);
-        this.keysetPage = null;
-    }
-
-    public KeysetAwarePageImpl(PagedList<T> list, Pageable pageable) {
-        super(list, keysetPageable(list.getKeysetPage(), pageable), list.getTotalSize());
-        this.keysetPage = list.getKeysetPage();
-    }
-
-    public KeysetAwarePageImpl(List<T> list, long totalSize, KeysetPage keysetPage, Pageable pageable) {
-        super(list, keysetPageable(keysetPage, pageable), totalSize);
-        this.keysetPage = keysetPage;
-    }
-
-    @Override
-    public KeysetPage getKeysetPage() {
-        return keysetPage;
-    }
-
-    @Override
-    public KeysetPageable nextPageable() {
-        return (KeysetPageable) super.nextPageable();
-    }
-
-    @Override
-    public KeysetPageable previousPageable() {
-        return (KeysetPageable) super.previousPageable();
-    }
-
-    private static Pageable keysetPageable(KeysetPage keysetPage, Pageable pageable) {
-        if (pageable instanceof KeysetPageRequest) {
-            if (keysetPage == null || ((KeysetPageRequest) pageable).getKeysetPage() == keysetPage) {
-                return pageable;
-            }
-        }
-
-        if (keysetPage == null) {
-            if (pageable instanceof KeysetPageable) {
-                return new KeysetPageRequest(null, pageable.getSort(), ((KeysetPageable) pageable).getIntOffset(), pageable.getPageSize());
-            } else {
-                return new KeysetPageRequest(pageable.getPageNumber(), pageable.getPageSize(), null, pageable.getSort());
-            }
-        } else {
-            return new KeysetPageRequest(keysetPage, pageable.getSort());
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwareSliceImpl.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwareSliceImpl.java
deleted file mode 100644
index cae07a8d1a..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwareSliceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.query;
-
-import com.blazebit.persistence.KeysetPage;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.spring.data.repository.KeysetAwareSlice;
-import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.SliceImpl;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class KeysetAwareSliceImpl<T> extends SliceImpl<T> implements KeysetAwareSlice<T> {
-
-    private final KeysetPage keysetPage;
-
-    public KeysetAwareSliceImpl(List<T> list) {
-        super(list);
-        this.keysetPage = null;
-    }
-
-    public KeysetAwareSliceImpl(PagedList<T> list, Pageable pageable) {
-        super(list.size() > pageable.getPageSize() ? list.subList(0, pageable.getPageSize()) : list, keysetPageable(list.getKeysetPage(), pageable), list.size() > pageable.getPageSize());
-        this.keysetPage = list.getKeysetPage();
-    }
-
-    public KeysetAwareSliceImpl(List<T> list, KeysetPage keysetPage, Pageable pageable) {
-        super(list.size() > pageable.getPageSize() ? list.subList(0, pageable.getPageSize()) : list, keysetPageable(keysetPage, pageable), list.size() > pageable.getPageSize());
-        this.keysetPage = keysetPage;
-    }
-
-    @Override
-    public KeysetPage getKeysetPage() {
-        return keysetPage;
-    }
-
-    @Override
-    public KeysetPageable nextPageable() {
-        return (KeysetPageable) super.nextPageable();
-    }
-
-    @Override
-    public KeysetPageable previousPageable() {
-        return (KeysetPageable) super.previousPageable();
-    }
-
-    private static Pageable keysetPageable(KeysetPage keysetPage, Pageable pageable) {
-        if (pageable instanceof KeysetPageRequest) {
-            if (keysetPage == null || ((KeysetPageRequest) pageable).getKeysetPage() == keysetPage) {
-                return pageable;
-            }
-        }
-
-        if (keysetPage == null) {
-            if (pageable instanceof KeysetPageable) {
-                return new KeysetPageRequest(null, pageable.getSort(), ((KeysetPageable) pageable).getIntOffset(), pageable.getPageSize());
-            } else {
-                return new KeysetPageRequest(pageable.getPageNumber(), pageable.getPageSize(), null, pageable.getSort());
-            }
-        } else {
-            return new KeysetPageRequest(keysetPage, pageable.getSort());
-        }
-    }
-
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterBinder.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterBinder.java
deleted file mode 100644
index 727a97747c..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterBinder.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright 2008-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.base.query;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.query.AbstractJpaQuery;
-import org.springframework.data.jpa.repository.query.QueryUtils;
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.util.Assert;
-
-import javax.persistence.Query;
-import java.util.Date;
-
-/**
- * {@link org.springframework.data.jpa.repository.query.ParameterBinder} is used to bind method parameters to a {@link Query}. This is usually done whenever an
- * {@link AbstractJpaQuery} is executed.
- *
- * Christian Beikov: Copied to be able to share code between Spring Data integrations for 1.x and 2.x.
- * 
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-public abstract class ParameterBinder {
-
-    private final JpaParameters parameters;
-    private final ParameterAccessor accessor;
-    private final Object[] values;
-
-    /**
-     * Creates a new {@link org.springframework.data.jpa.repository.query.ParameterBinder}.
-     *
-     * @param parameters must not be {@literal null}.
-     * @param values must not be {@literal null}.
-     */
-    public ParameterBinder(JpaParameters parameters, Object[] values) {
-
-        Assert.notNull(parameters, "JpaParameters must not be null!");
-        Assert.notNull(values, "Values must not be null!");
-
-        Assert.isTrue(parameters.getNumberOfParameters() == values.length, "Invalid number of parameters given!");
-
-        this.parameters = parameters;
-        this.values = values.clone();
-        this.accessor = new ParametersParameterAccessor(parameters, this.values);
-    }
-
-    ParameterBinder(JpaParameters parameters) {
-        this(parameters, new Object[0]);
-    }
-
-    /**
-     * Returns the {@link Pageable} of the parameters, if available. Returns {@code null} otherwise.
-     *
-     * @return
-     */
-    public Pageable getPageable() {
-        return accessor.getPageable();
-    }
-
-    /**
-     * Returns the sort instance to be used for query creation. Will use a {@link Sort} parameter if available or the
-     * {@link Sort} contained in a {@link Pageable} if available. Returns {@code null} if no {@link Sort} can be found.
-     *
-     * @return
-     */
-    public Sort getSort() {
-        return accessor.getSort();
-    }
-
-    /**
-     * Binds the parameters to the given {@link Query}.
-     *
-     * @param query
-     * @return
-     */
-    public <T extends Query> T bind(T query) {
-
-        int bindableParameterIndex = 0;
-        int queryParameterPosition = 1;
-
-        for (JpaParameters.JpaParameter parameter : parameters) {
-
-            if (canBindParameter(parameter)) {
-
-                Object value = accessor.getBindableValue(bindableParameterIndex);
-                bind(query, parameter, value, queryParameterPosition++);
-                bindableParameterIndex++;
-            }
-        }
-
-        return query;
-    }
-
-    /**
-     * Returns {@literal true} if the given parameter can be bound.
-     *
-     * @param parameter
-     * @return
-     */
-    protected boolean canBindParameter(Parameter parameter) {
-        return parameter.isBindable();
-    }
-
-    /**
-     * Perform the actual query parameter binding.
-     *
-     * @param query
-     * @param parameter
-     * @param value
-     * @param position
-     */
-    protected void bind(Query query, JpaParameters.JpaParameter parameter, Object value, int position) {
-
-        if (parameter.isTemporalParameter()) {
-            if (hasNamedParameter(query) && parameter.isNamedParameter()) {
-                query.setParameter(parameter.getParameterName(), (Date) value, parameter.getTemporalType());
-            } else {
-                query.setParameter(position, (Date) value, parameter.getTemporalType());
-            }
-            return;
-        }
-
-        if (hasNamedParameter(query) && parameter.isNamedParameter()) {
-            query.setParameter(parameter.getParameterName(), value);
-        } else {
-            query.setParameter(position, value);
-        }
-    }
-
-    /**
-     * Binds the parameters to the given query and applies special parameter types (e.g. pagination).
-     *
-     * @param query
-     * @return
-     */
-    public Query bindAndPrepare(Query query) {
-        return bindAndPrepare(query, parameters);
-    }
-
-    boolean hasNamedParameter(Query query) {
-        return QueryUtils.hasNamedParameter(query);
-    }
-
-    private Query bindAndPrepare(Query query, Parameters<?, ?> parameters) {
-
-        Query result = bind(query);
-
-        if (!parameters.hasPageableParameter() || getPageable() == null) {
-            return result;
-        }
-
-        result.setFirstResult(getOffset());
-        result.setMaxResults(getPageable().getPageSize());
-
-        return result;
-    }
-
-    protected abstract int getOffset();
-
-    /**
-     * Returns the parameters.
-     *
-     * @return
-     */
-    JpaParameters getParameters() {
-        return parameters;
-    }
-
-    protected Object[] getValues() {
-        return values;
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterMetadataProvider.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterMetadataProvider.java
deleted file mode 100644
index 4110756757..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/ParameterMetadataProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2011-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.persistence.spring.data.base.query;
-
-import org.springframework.data.repository.query.Parameter;
-import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.parser.Part;
-
-import javax.persistence.criteria.ParameterExpression;
-import java.util.List;
-
-/**
- * Helper class to allow easy creation of {@link ParameterMetadata}s.
- *
- * Christian Beikov:
- * We have to copy the spring data <code>ParameterMetadataProvider</code> class unfortunately to be compatible.
- * For better reuse, we introduced an interface that version specific integrations implement.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-public interface ParameterMetadataProvider {
-
-    /**
-     * Returns all {@link ParameterMetadata}s built.
-     *
-     * @return the expressions
-     */
-    public List<ParameterMetadata<?>> getExpressions();
-
-    /**
-     * Builds a new {@link ParameterMetadata} for given {@link Part} and the next {@link Parameter}.
-     *
-     * @param <T>
-     * @return
-     */
-    public <T> ParameterMetadata<T> next(Part part);
-
-    /**
-     * Builds a new {@link ParameterMetadata} of the given {@link Part} and type. Forwards the underlying
-     * {@link Parameters} as well.
-     *
-     * @param <T>
-     * @param type must not be {@literal null}.
-     * @return
-     */
-    public <T> ParameterMetadata<? extends T> next(Part part, Class<T> type);
-
-    /**
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     * @param <T>
-     */
-    public static interface ParameterMetadata<T> {
-
-        static final Object PLACEHOLDER = new Object();
-
-        /**
-         * Returns the {@link ParameterExpression}.
-         *
-         * @return the expression
-         */
-        public ParameterExpression<T> getExpression();
-
-        /**
-         * Returns whether the parameter shall be considered an {@literal IS NULL} parameter.
-         *
-         * @return
-         */
-        public boolean isIsNullParameter();
-
-        /**
-         * Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
-         *
-         * @param value must not be {@literal null}.
-         * @return
-         */
-        public Object prepare(Object value);
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/AbstractEntityViewAwareRepository.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/AbstractEntityViewAwareRepository.java
deleted file mode 100644
index 6f2192de1b..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/AbstractEntityViewAwareRepository.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.repository;
-
-import com.blazebit.persistence.CriteriaBuilder;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.PagedList;
-import com.blazebit.persistence.PaginatedCriteriaBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
-import com.blazebit.persistence.criteria.BlazeCriteriaQuery;
-import com.blazebit.persistence.criteria.BlazeCriteria;
-import com.blazebit.persistence.parser.EntityMetamodel;
-import com.blazebit.persistence.spi.ExtendedManagedType;
-import com.blazebit.persistence.spring.data.base.EntityViewSortUtil;
-import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.EntityViewSetting;
-import com.blazebit.persistence.view.spi.type.EntityViewProxy;
-
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.convert.QueryByExamplePredicateBuilder;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.query.EscapeCharacter;
-import org.springframework.data.jpa.repository.query.JpaEntityGraph;
-import org.springframework.data.jpa.repository.query.QueryUtils;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.springframework.data.jpa.repository.query.QueryUtils.applyAndBind;
-import static org.springframework.data.jpa.repository.query.QueryUtils.getQueryString;
-
-/**
- * @author Moritz Becker
- * @author Christian Beikov
- * @since 1.2.0
- */
-@Transactional(readOnly = true)
-public abstract class AbstractEntityViewAwareRepository<V, E, ID extends Serializable> {
-
-    private static final String ID_MUST_NOT_BE_NULL = "The given id must not be null!";
-    private static final String DELETE_ALL_QUERY_STRING = "delete from %s x";
-    private static final String DELETE_ALL_QUERY_BY_ID_STRING = "delete from %s x where %s in :ids";
-    private static final String[] EMPTY = new String[0];
-    private static final EscapeCharacter DEFAULT = EscapeCharacter.of('\\');
-    private static final Pageable UNPAGED;
-
-    static {
-        Pageable unpaged = null;
-        try {
-            Method unpagedMethod = Class.forName("org.springframework.data.domain.Pageable").getMethod("unpaged");
-            unpaged = (Pageable) unpagedMethod.invoke(null);
-        } catch (Exception e) {
-            // ignore
-        }
-        UNPAGED = unpaged;
-    }
-
-    protected EscapeCharacter escapeCharacter = DEFAULT;
-
-    private final JpaEntityInformation<E, ?> entityInformation;
-    private final EntityManager entityManager;
-    private final CriteriaBuilderFactory cbf;
-    private final EntityViewManager evm;
-    private final Class<V> entityViewClass;
-    private final String idAttributeName;
-
-    private EntityViewAwareCrudMethodMetadata metadata;
-
-    public AbstractEntityViewAwareRepository(JpaEntityInformation<E, ?> entityInformation, EntityManager entityManager, CriteriaBuilderFactory cbf, EntityViewManager evm, Class<V> entityViewClass) {
-        this.entityInformation = entityInformation;
-        this.entityManager = entityManager;
-        this.cbf = cbf;
-        this.evm = evm;
-        this.entityViewClass = entityViewClass;
-        this.idAttributeName = getIdAttribute(getDomainClass());
-    }
-
-    public void setRepositoryMethodMetadata(EntityViewAwareCrudMethodMetadata crudMethodMetadata) {
-        this.metadata = crudMethodMetadata;
-    }
-
-    public void setEscapeCharacter(EscapeCharacter escapeCharacter) {
-        this.escapeCharacter = escapeCharacter;
-    }
-
-    protected EntityViewAwareCrudMethodMetadata getRepositoryMethodMetadata() {
-        return metadata;
-    }
-
-    protected Class<E> getDomainClass() {
-        return entityInformation.getJavaType();
-    }
-
-    protected EntityManager getEntityManager() {
-        return entityManager;
-    }
-
-    protected abstract Map<String, Object> tryGetFetchGraphHints(EntityManager entityManager, JpaEntityGraph entityGraph, Class<?> entityType);
-
-    protected Map<String, Object> getQueryHints(boolean applyFetchGraph) {
-        if (metadata == null) {
-            return Collections.emptyMap();
-        }
-
-        if (metadata.getEntityGraph() == null || !applyFetchGraph) {
-            return metadata.getQueryHints();
-        }
-
-        Map<String, Object> hints = new HashMap<String, Object>();
-        hints.putAll(metadata.getQueryHints());
-
-        hints.putAll(tryGetFetchGraphHints(entityManager, getEntityGraph(), getDomainClass()));
-
-        return hints;
-    }
-
-    private JpaEntityGraph getEntityGraph() {
-        String fallbackName = this.entityInformation.getEntityName() + "." + metadata.getMethod().getName();
-        return new JpaEntityGraph(metadata.getEntityGraph(), fallbackName);
-    }
-
-    @Transactional
-    public <S extends E> S save(S entity) {
-        if (entity instanceof EntityViewProxy) {
-            evm.save(entityManager, entity);
-            return entity;
-        } else if (entityInformation.isNew(entity)) {
-            entityManager.persist(entity);
-            return entity;
-        } else {
-            return entityManager.merge(entity);
-        }
-    }
-
-    @Transactional
-    public <S extends E> List<S> saveAll(Iterable<S> entities) {
-        return save(entities);
-    }
-
-    @Transactional
-    public <S extends E> List<S> saveAllAndFlush(Iterable<S> entities) {
-        List<S> result = saveAll(entities);
-        flush();
-        return result;
-    }
-
-    @Transactional
-    public <S extends E> List<S> save(Iterable<S> entities) {
-        List<S> result = new ArrayList<S>();
-
-        if (entities == null) {
-            return result;
-        }
-
-        for (S entity : entities) {
-            result.add(save(entity));
-        }
-
-        return result;
-    }
-
-    @Transactional
-    public void flush() {
-        entityManager.flush();
-    }
-
-    @Transactional
-    public <S extends E> S saveAndFlush(S entity) {
-        S result = save(entity);
-        flush();
-
-        return result;
-    }
-
-    @Transactional
-    public void deleteById(ID id) {
-        delete(id);
-    }
-
-    @Transactional
-    public void delete(ID id) {
-        Assert.notNull(id, ID_MUST_NOT_BE_NULL);
-
-        E entity = (E) findOne(id);
-
-        if (entity == null) {
-            throw new EmptyResultDataAccessException(
-                    String.format("No %s entity with id %s exists!", entityInformation.getJavaType(), id), 1);
-        }
-
-        delete(entity);
-    }
-
-    @Transactional
-    public void delete(E entity) {
-        Assert.notNull(entity, "The entity must not be null!");
-        if (entity instanceof EntityViewProxy) {
-            evm.remove(entityManager, entity);
-        } else {
-            entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity));
-        }
-    }
-
-    @Transactional
-    public void delete(Iterable<? extends E> entities) {
-        Assert.notNull(entities, "The given Iterable of entities not be null!");
-
-        for (E entity : entities) {
-            delete(entity);
-        }
-    }
-
-    @Transactional
-    public void deleteAll() {
-        for (E element : (Iterable<E>) findAll()) {
-            delete(element);
-        }
-    }
-
-    @Transactional
-    public void deleteAll(Iterable<? extends E> entities) {
-        delete(entities);
-    }
-
-    @Transactional
-    public void deleteInBatch(Iterable<E> entities) {
-        Assert.notNull(entities, "The given Iterable of entities not be null!");
-
-        if (!entities.iterator().hasNext()) {
-            return;
-        }
-
-        applyAndBind(getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName()), entities, entityManager)
-                .executeUpdate();
-    }
-
-    @Transactional
-    public void deleteAllInBatch(Iterable<E> entities) {
-        deleteInBatch(entities);
-    }
-
-    @Transactional
-    public void deleteAllById(Iterable<? extends ID> ids) {
-        deleteAllByIdInBatch((Iterable<ID>) ids);
-    }
-
-    @Transactional
-    public void deleteAllByIdInBatch(Iterable<ID> ids) {
-
-        Assert.notNull(ids, "Ids must not be null!");
-
-        if (!ids.iterator().hasNext()) {
-            return;
-        }
-
-        String queryTemplate = DELETE_ALL_QUERY_BY_ID_STRING;
-        String queryString = String.format(queryTemplate, entityInformation.getEntityName(), entityInformation.getIdAttribute().getName());
-
-        Query query = entityManager.createQuery(queryString);
-        query.setParameter("ids", ids);
-
-        query.executeUpdate();
-    }
-
-    @Transactional
-    public void deleteAllInBatch() {
-        entityManager.createQuery(getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName())).executeUpdate();
-    }
-
-    public E getOne(ID id) {
-        return (E) getReference(id);
-    }
-
-    public E getById(ID id) {
-        return (E) getReference(id);
-    }
-
-    public E getReferenceById(ID id) {
-        return (E) getReference(id);
-    }
-
-    public <S extends E> long count(Example<S> example) {
-        return executeCountQuery(getCountQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType()));
-    }
-
-    public <S extends E> boolean exists(Example<S> example) {
-        return !getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getResultList()
-                .isEmpty();
-    }
-
-    public boolean exists(Specification<E> spec) {
-        return !getQuery(spec, getDomainClass(), (Sort) null).getResultList().isEmpty();
-    }
-
-    public <S extends E> List<S> findAll(Example<S> example) {
-        return getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), (Sort) null).getResultList();
-    }
-
-    public <S extends E> List<S> findAll(Example<S> example, Sort sort) {
-        return getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), sort).getResultList();
-    }
-
-    public <S extends E> Page<S> findAll(Example<S> example, Pageable pageable) {
-        Class<S> probeType = example.getProbeType();
-        TypedQuery<S> query = getQuery(new ExampleSpecification<>(example, escapeCharacter), probeType, pageable);
-
-        return pageable == null || pageable == UNPAGED ? new KeysetAwarePageImpl<>(query.getResultList()) : new KeysetAwarePageImpl<>((PagedList<S>) query.getResultList(), pageable);
-    }
-
-    public List<E> findAll(Sort sort) {
-        return getQuery(null, sort).getResultList();
-    }
-
-    public Page<E> findAll(Pageable pageable) {
-        if (pageable == null || pageable == UNPAGED) {
-            return (Page<E>) new PageImpl<>(findAll());
-        }
-
-        return (Page<E>) findAll((Specification<E>) null, pageable);
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    protected static class ExampleSpecification<T> implements Specification<T> {
-
-        private static final Method GET_PREDICATE_NEW;
-
-        static {
-            Method getPredicate = null;
-            try {
-                getPredicate = QueryByExamplePredicateBuilder.class.getMethod("getPredicate", Root.class, javax.persistence.criteria.CriteriaBuilder.class, Example.class, EscapeCharacter.class);
-            } catch (NoSuchMethodException e) {
-                // Ignore
-            }
-            GET_PREDICATE_NEW = getPredicate;
-        }
-
-        private final Example<T> example;
-        private final EscapeCharacter escapeCharacter;
-
-        public ExampleSpecification(Example<T> example, EscapeCharacter escapeCharacter) {
-            Assert.notNull(example, "Example must not be null!");
-            Assert.notNull(escapeCharacter, "EscapeCharacter must not be null!");
-            this.example = example;
-            this.escapeCharacter = escapeCharacter;
-        }
-
-        @Override
-        public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, javax.persistence.criteria.CriteriaBuilder cb) {
-            if ( GET_PREDICATE_NEW != null ) {
-                try {
-                    return (Predicate) GET_PREDICATE_NEW.invoke(null, cb, example, escapeCharacter);
-                } catch (RuntimeException e) {
-                    throw e;
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            return QueryByExamplePredicateBuilder.getPredicate(root, cb, example);
-        }
-    }
-
-    public V findOne(ID id) {
-        Assert.notNull(id, ID_MUST_NOT_BE_NULL);
-
-        CriteriaBuilder<?> cb = cbf.create(entityManager, getDomainClass())
-                .where(idAttributeName).eq(id);
-        String[] fetches = EMPTY;
-        if (metadata != null && metadata.getEntityGraph() != null && (fetches = metadata.getEntityGraph().attributePaths()).length != 0) {
-            cb.fetch(fetches);
-        }
-        TypedQuery<V> findOneQuery;
-        Class<V> entityViewClass = metadata == null || metadata.getEntityViewClass() == null ? this.entityViewClass : (Class<V>) metadata.getEntityViewClass();
-        if (entityViewClass == null) {
-            findOneQuery = (TypedQuery<V>) cb.getQuery();
-        } else {
-            findOneQuery = evm.applySetting(EntityViewSetting.create(entityViewClass), cb).getQuery();
-        }
-
-        applyQueryHints(findOneQuery, fetches.length == 0);
-
-        try {
-            return findOneQuery.getSingleResult();
-        } catch (NoResultException e) {
-            return null;
-        }
-    }
-
-    public V getReference(ID id) {
-        Assert.notNull(id, ID_MUST_NOT_BE_NULL);
-        Class<V> entityViewClass = metadata == null || metadata.getEntityViewClass() == null ? this.entityViewClass : (Class<V>) metadata.getEntityViewClass();
-        if (entityViewClass == null) {
-            return (V) entityManager.getReference(getDomainClass(), id);
-        } else {
-            return evm.getReference(entityViewClass, id);
-        }
-    }
-
-    public long count() {
-        TypedQuery<Long> countQuery = getCountQuery(null, getDomainClass());
-        return ((Number) countQuery.getSingleResult()).longValue();
-    }
-
-    public boolean existsById(ID id) {
-        return exists(id);
-    }
-
-    public boolean exists(ID id) {
-        Assert.notNull(id, ID_MUST_NOT_BE_NULL);
-
-        TypedQuery<Object> existsQuery = cbf.create(entityManager, Object.class)
-                .from(getDomainClass())
-                // Empty string because SQLServer can't interpret a number properly when using TOP clause
-                .select("''")
-                .where(idAttributeName).eq(id)
-                .setMaxResults(1)
-                .getQuery();
-
-        applyRepositoryMethodMetadata(existsQuery, true);
-
-        try {
-            return !existsQuery.getResultList().isEmpty();
-        } catch (NoResultException e) {
-            return false;
-        }
-    }
-
-    public List<V> findAll() {
-        return getQuery(null, getDomainClass(), null, null).getResultList();
-    }
-
-    public List<V> findAllById(Iterable<ID> idIterable) {
-        return findAll(idIterable);
-    }
-
-    public List<V> findAll(Iterable<ID> idIterable) {
-        Assert.notNull(idIterable, ID_MUST_NOT_BE_NULL);
-
-        List<ID> idList = new ArrayList<>();
-        for (ID id : idIterable) {
-            idList.add(id);
-        }
-        CriteriaBuilder<?> cb = cbf.create(entityManager, getDomainClass())
-                .where(idAttributeName).in(idList);
-
-        String[] fetches = EMPTY;
-        if (metadata != null && metadata.getEntityGraph() != null && (fetches = metadata.getEntityGraph().attributePaths()).length != 0) {
-            cb.fetch(fetches);
-        }
-        TypedQuery<V> findAllByIdsQuery;
-        Class<V> entityViewClass = metadata == null || metadata.getEntityViewClass() == null ? this.entityViewClass : (Class<V>) metadata.getEntityViewClass();
-        if (entityViewClass == null) {
-            findAllByIdsQuery = (TypedQuery<V>) cb.getQuery();
-        } else {
-            findAllByIdsQuery = evm.applySetting(EntityViewSetting.create(entityViewClass), cb).getQuery();
-        }
-
-        applyRepositoryMethodMetadata(findAllByIdsQuery, fetches.length == 0);
-
-        return findAllByIdsQuery.getResultList();
-    }
-
-    private String getIdAttribute(Class<?> entityClass) {
-        return cbf.getService(EntityMetamodel.class)
-                .getManagedType(ExtendedManagedType.class, entityClass)
-                .getIdAttribute()
-                .getName();
-    }
-
-    public List<V> findAll(Specification<E> spec) {
-        return (List<V>) getQuery(spec, (Sort) null).getResultList();
-    }
-
-    public Page<V> findAll(Specification<E> spec, Pageable pageable) {
-        TypedQuery<V> query = getQuery(spec, pageable);
-        if (pageable == null || pageable == UNPAGED) {
-            return new KeysetAwarePageImpl<>(query.getResultList());
-        }
-        PagedList<V> resultList = (PagedList<V>) query.getResultList();
-        Long total = resultList.getTotalSize();
-
-        if (total.equals(0L)) {
-            return new KeysetAwarePageImpl<>(Collections.<V>emptyList(), total, null, pageable);
-        }
-
-        return new KeysetAwarePageImpl<>(resultList, pageable);
-    }
-
-    public List<V> findAll(Specification<E> spec, Sort sort) {
-        return (List<V>) getQuery(spec, sort).getResultList();
-    }
-
-    public long count(Specification<E> spec) {
-        return executeCountQuery(getCountQuery(spec, getDomainClass()));
-    }
-
-    protected TypedQuery<V> getQuery(Specification<E> spec, Pageable pageable) {
-        Sort sort = pageable == null ? null : pageable.getSort();
-        return this.getQuery(spec, getDomainClass(), pageable, sort);
-    }
-
-    protected <S extends E> TypedQuery<S> getQuery(Specification<S> spec, Class<S> domainClass, Pageable pageable) {
-        Sort sort = pageable == null ? null : pageable.getSort();
-        return (TypedQuery<S>) this.getQuery(spec, domainClass, pageable, sort);
-    }
-
-    protected TypedQuery<E> getQuery(Specification<E> spec, Sort sort) {
-        return (TypedQuery<E>) this.getQuery(spec, getDomainClass(), null, sort);
-    }
-
-    protected <S extends E> TypedQuery<S> getQuery(Specification<S> spec, Class<S> domainClass, Sort sort) {
-        return (TypedQuery<S>) this.getQuery(spec, domainClass, null, sort);
-    }
-
-    protected <S extends E> TypedQuery<V> getQuery(Specification<S> spec, Class<S> domainClass, Pageable pageable, Sort sort) {
-        BlazeCriteriaQuery<S> cq = BlazeCriteria.get(cbf, domainClass);
-        Root<S> root = this.applySpecificationToCriteria(spec, domainClass, cq);
-
-        Class<V> entityViewClass = metadata == null
-            || metadata.getEntityViewClass() == null ? this.entityViewClass : (Class<V>) metadata.getEntityViewClass();
-
-        if (sort != null && entityViewClass == null) {
-            cq.orderBy(QueryUtils.toOrders(sort, root, BlazeCriteria.get(cbf)));
-        }
-        CriteriaBuilder<S> cb = cq.createCriteriaBuilder(entityManager);
-
-        String[] fetches = EMPTY;
-        if (metadata != null && metadata.getEntityGraph() != null && (fetches = metadata.getEntityGraph().attributePaths()).length != 0) {
-            cb.fetch(fetches);
-        }
-
-        boolean withCountQuery = true;
-        boolean withKeysetExtraction = false;
-        boolean withExtractAllKeysets = false;
-
-        TypedQuery<V> query;
-        if (entityViewClass == null) {
-            if (pageable == null || pageable == UNPAGED) {
-                query = (TypedQuery<V>) cb.getQuery();
-            } else {
-                PaginatedCriteriaBuilder<S> paginatedCriteriaBuilder;
-                if (pageable instanceof KeysetPageable) {
-                    KeysetPageable keysetPageable = (KeysetPageable) pageable;
-                    paginatedCriteriaBuilder = cb.page(keysetPageable.getKeysetPage(), getOffset(pageable), pageable.getPageSize());
-                    withCountQuery = keysetPageable.isWithCountQuery();
-                    withKeysetExtraction = true;
-                    withExtractAllKeysets = keysetPageable.isWithExtractAllKeysets();
-                } else {
-                    paginatedCriteriaBuilder = cb.page(getOffset(pageable), pageable.getPageSize());
-                }
-                if (withKeysetExtraction) {
-                    paginatedCriteriaBuilder.withKeysetExtraction(true);
-                    paginatedCriteriaBuilder.withExtractAllKeysets(withExtractAllKeysets);
-                }
-                paginatedCriteriaBuilder.withCountQuery(withCountQuery);
-                query = (TypedQuery<V>) paginatedCriteriaBuilder.getQuery();
-            }
-        } else {
-            if (pageable == null || pageable == UNPAGED) {
-                EntityViewSetting<V, CriteriaBuilder<V>> setting = EntityViewSetting.create(entityViewClass);
-                CriteriaBuilder<V> fqb = evm.applySetting(setting, cb);
-                if (sort != null) {
-                    EntityViewSortUtil.applySort(evm, entityViewClass, fqb, sort);
-                }
-                query = fqb.getQuery();
-            } else {
-                EntityViewSetting<V, PaginatedCriteriaBuilder<V>> setting = EntityViewSetting.create(entityViewClass, getOffset(pageable), pageable.getPageSize());
-                if (pageable instanceof KeysetPageable) {
-                    KeysetPageable keysetPageable = (KeysetPageable) pageable;
-                    setting.withKeysetPage(keysetPageable.getKeysetPage());
-                    withCountQuery = keysetPageable.isWithCountQuery();
-                    withKeysetExtraction = true;
-                    withExtractAllKeysets = keysetPageable.isWithExtractAllKeysets();
-                }
-                PaginatedCriteriaBuilder<V> paginatedCriteriaBuilder = evm.applySetting(setting, cb);
-                if (withKeysetExtraction) {
-                    paginatedCriteriaBuilder.withKeysetExtraction(true);
-                    paginatedCriteriaBuilder.withExtractAllKeysets(withExtractAllKeysets);
-                }
-                paginatedCriteriaBuilder.withCountQuery(withCountQuery);
-                if (sort != null || (sort = pageable.getSort()) != null) {
-                    EntityViewSortUtil.applySort(evm, entityViewClass, paginatedCriteriaBuilder, sort);
-                }
-                query = paginatedCriteriaBuilder.getQuery();
-            }
-        }
-
-        return this.applyRepositoryMethodMetadata(query, fetches.length == 0);
-    }
-
-    protected abstract int getOffset(Pageable pageable);
-
-    protected <S extends E> TypedQuery<Long> getCountQuery(Specification<S> spec, Class<S> domainClass) {
-        BlazeCriteriaBuilder builder = BlazeCriteria.get(cbf);
-        BlazeCriteriaQuery<Long> query = builder.createQuery(Long.class);
-
-        Root<S> root = applySpecificationToCriteria(spec, domainClass, query);
-
-        if (query.isDistinct()) {
-            query.select(builder.countDistinct(root));
-        } else {
-            query.select(builder.count(root));
-        }
-
-        // Remove all Orders the Specifications might have applied
-        query.orderBy(Collections.<Order> emptyList());
-
-        return this.applyRepositoryMethodMetadata(query.createCriteriaBuilder(entityManager).getQuery(), true);
-    }
-
-    private <S extends E> Root<S> applySpecificationToCriteria(Specification<S> spec, Class<S> domainClass, CriteriaQuery<?> query) {
-        Assert.notNull(domainClass, "Domain class must not be null!");
-        Assert.notNull(query, "CriteriaQuery must not be null!");
-        Root<S> root = query.from(domainClass);
-        if (spec == null) {
-            return root;
-        } else {
-            Predicate predicate = spec.toPredicate(root, query, ((BlazeCriteriaQuery<?>) query).getCriteriaBuilder());
-            if (predicate != null) {
-                query.where(predicate);
-            }
-
-            return root;
-        }
-    }
-
-    private <S> TypedQuery<S> applyRepositoryMethodMetadata(TypedQuery<S> query, boolean applyFetchGraph) {
-        if (this.metadata == null) {
-            return query;
-        } else {
-            LockModeType type = this.metadata.getLockModeType();
-            TypedQuery<S> toReturn = type == null ? query : query.setLockMode(type);
-            this.applyQueryHints(toReturn, applyFetchGraph);
-            return toReturn;
-        }
-    }
-
-    private void applyQueryHints(Query query, boolean applyFetchGraph) {
-        for (Map.Entry<String, Object> hint : getQueryHints(applyFetchGraph).entrySet()) {
-            query.setHint(hint.getKey(), hint.getValue());
-        }
-    }
-
-    private static Long executeCountQuery(TypedQuery<Long> query) {
-
-        Assert.notNull(query, "TypedQuery must not be null!");
-
-        List<Long> totals = query.getResultList();
-        Long total = 0L;
-
-        for (Long element : totals) {
-            total += element == null ? 0 : element;
-        }
-
-        return total;
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadata.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadata.java
deleted file mode 100644
index 3252012bc7..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadata.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.base.repository;
-
-import org.springframework.data.jpa.repository.EntityGraph;
-
-import javax.persistence.LockModeType;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Variant that is aware of entity views.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface EntityViewAwareCrudMethodMetadata {
-
-    LockModeType getLockModeType();
-
-    Map<String, Object> getQueryHints();
-
-    EntityGraph getEntityGraph();
-
-    Method getMethod();
-
-    Class<?> getEntityViewClass();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadataPostProcessor.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadataPostProcessor.java
deleted file mode 100644
index 56a9362170..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareCrudMethodMetadataPostProcessor.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright 2014 - 2024 Blazebit.
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.blazebit.persistence.spring.data.base.repository;
-
-import com.blazebit.persistence.spring.data.base.query.EntityViewAwareRepositoryMetadata;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.metamodel.ManagedViewType;
-import com.blazebit.reflection.ReflectionUtils;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.ProxyMethodInvocation;
-import org.springframework.aop.TargetSource;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Lock;
-import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.data.jpa.repository.support.CrudMethodMetadata;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import javax.persistence.LockModeType;
-import javax.persistence.QueryHint;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * Adapted {@link org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor} to be able to use the {@link EntityViewManager} so that we can safely determine if a class is an entity view.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class EntityViewAwareCrudMethodMetadataPostProcessor implements RepositoryProxyPostProcessor, BeanClassLoaderAware {
-
-    private ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
-     */
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader == null ? ClassUtils.getDefaultClassLoader() : classLoader;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.core.support.RepositoryProxyPostProcessor#postProcess(org.springframework.aop.framework.ProxyFactory, org.springframework.data.repository.core.RepositoryInformation)
-     */
-    @Override
-    public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) {
-        factory.addAdvice(new CrudMethodMetadataPopulatingMethodInterceptor(((EntityViewAwareRepositoryMetadata) repositoryInformation).getEntityViewManager()));
-    }
-
-    /**
-     * Returns a {@link CrudMethodMetadata} proxy that will lookup the actual target object by obtaining a thread bound
-     * instance from the {@link TransactionSynchronizationManager} later.
-     */
-    public EntityViewAwareCrudMethodMetadata getCrudMethodMetadata() {
-
-        ProxyFactory factory = new ProxyFactory();
-
-        factory.addInterface(EntityViewAwareCrudMethodMetadata.class);
-        factory.setTargetSource(new ThreadBoundTargetSource());
-
-        return (EntityViewAwareCrudMethodMetadata) factory.getProxy(this.classLoader);
-    }
-
-    /**
-     * {@link MethodInterceptor} to build and cache {@link EntityViewAwareDefaultCrudMethodMetadata} instances for the invoked methods.
-     * Will bind the found information to a {@link TransactionSynchronizationManager} for later lookup.
-     *
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     * @see EntityViewAwareDefaultCrudMethodMetadata
-     */
-    private static final class CrudMethodMetadataPopulatingMethodInterceptor implements MethodInterceptor {
-
-        private final ConcurrentMap<EntityViewMetadataCacheKey, EntityViewAwareCrudMethodMetadata> metadataCache = new ConcurrentHashMap<>();
-        private final EntityViewManager evm;
-
-        private CrudMethodMetadataPopulatingMethodInterceptor(EntityViewManager evm) {
-            this.evm = evm;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
-         */
-        public Object invoke(MethodInvocation invocation) throws Throwable {
-            Method method = invocation.getMethod();
-            EntityViewAwareCrudMethodMetadata metadata = (EntityViewAwareCrudMethodMetadata) TransactionSynchronizationManager.getResource(method);
-
-            if (metadata != null) {
-                return invocation.proceed();
-            }
-
-            EntityViewMetadataCacheKey cacheKey = new EntityViewMetadataCacheKey(method, ((ProxyMethodInvocation) invocation).getProxy().getClass());
-            EntityViewAwareCrudMethodMetadata methodMetadata = metadataCache.get(cacheKey);
-
-            if (methodMetadata == null) {
-                methodMetadata = new EntityViewAwareDefaultCrudMethodMetadata(cacheKey.proxyClass, method, evm);
-                EntityViewAwareCrudMethodMetadata tmp = metadataCache.putIfAbsent(cacheKey, methodMetadata);
-
-                if (tmp != null) {
-                    methodMetadata = tmp;
-                }
-            }
-
-            TransactionSynchronizationManager.bindResource(method, methodMetadata);
-
-            try {
-                return invocation.proceed();
-            } finally {
-                TransactionSynchronizationManager.unbindResource(method);
-            }
-        }
-    }
-
-    /**
-     * Cache key for entity view metadata.
-     *
-     * @author Christian Beikov
-     * @since 1.3.0
-     */
-    private static class EntityViewMetadataCacheKey {
-        private final Method method;
-        private final Class<?> proxyClass;
-
-        public EntityViewMetadataCacheKey(Method method, Class<?> proxyClass) {
-            this.method = method;
-            this.proxyClass = proxyClass;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof EntityViewMetadataCacheKey)) {
-                return false;
-            }
-
-            EntityViewMetadataCacheKey that = (EntityViewMetadataCacheKey) o;
-            return method.equals(that.method) && proxyClass.equals(that.proxyClass);
-        }
-
-        @Override
-        public int hashCode() {
-            int result = method.hashCode();
-            result = 31 * result + proxyClass.hashCode();
-            return result;
-        }
-    }
-
-    /**
-     * Default implementation of {@link CrudMethodMetadata} that will inspect the backing method for annotations.
-     *
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     */
-    private static class EntityViewAwareDefaultCrudMethodMetadata implements EntityViewAwareCrudMethodMetadata {
-
-        private final LockModeType lockModeType;
-        private final Map<String, Object> queryHints;
-        private final EntityGraph entityGraph;
-        private final Class<?> entityViewClass;
-        private final Method method;
-
-        /**
-         * Creates a new {@link EntityViewAwareDefaultCrudMethodMetadata} for the given {@link Method}.
-         *  @param repositoryClass The repository class
-         * @param method must not be {@literal null}.
-         * @param evm the {@link EntityViewManager}
-         */
-        public EntityViewAwareDefaultCrudMethodMetadata(Class<?> repositoryClass, Method method, EntityViewManager evm) {
-            Assert.notNull(method, "Method must not be null!");
-
-            Method annotationTargetMethod = findAnnotationTargetMethod(method);
-            this.lockModeType = findLockModeType(annotationTargetMethod);
-            this.queryHints = findQueryHints(annotationTargetMethod);
-            this.entityGraph = findEntityGraph(annotationTargetMethod);
-            this.entityViewClass = findEntityViewClass(repositoryClass, method, evm);
-            this.method = method;
-        }
-
-        private static Method findAnnotationTargetMethod(Method method) {
-            if (method.isBridge() || method.isSynthetic()) {
-                try {
-                    return method.getDeclaringClass().getMethod(method.getName(), method.getParameterTypes());
-                } catch (NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            return method;
-        }
-
-        private static Class<?> findEntityViewClass(Class<?> repositoryClass, Method methodToAnalyze, EntityViewManager evm) {
-            Class<?> entityViewClass;
-            Class<?>[] typeArguments = ReflectionUtils.getResolvedMethodReturnTypeArguments(repositoryClass, methodToAnalyze);
-            if (typeArguments.length == 0) {
-                entityViewClass = ReflectionUtils.getResolvedMethodReturnType(repositoryClass, methodToAnalyze);
-            } else {
-                entityViewClass = typeArguments[typeArguments.length - 1];
-            }
-            ManagedViewType<?> managedViewType = evm.getMetamodel().managedView(entityViewClass);
-            if (managedViewType == null) {
-                return null;
-            }
-            return managedViewType.getJavaType();
-        }
-
-        private static EntityGraph findEntityGraph(Method method) {
-            return AnnotatedElementUtils.findMergedAnnotation(method, EntityGraph.class);
-        }
-
-        private static LockModeType findLockModeType(Method method) {
-
-            Lock annotation = AnnotatedElementUtils.findMergedAnnotation(method, Lock.class);
-            return annotation == null ? null : (LockModeType) AnnotationUtils.getValue(annotation);
-        }
-
-        private static Map<String, Object> findQueryHints(Method method) {
-
-            Map<String, Object> queryHints = new HashMap<String, Object>();
-            QueryHints queryHintsAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, QueryHints.class);
-
-            if (queryHintsAnnotation != null) {
-
-                for (QueryHint hint : queryHintsAnnotation.value()) {
-                    queryHints.put(hint.name(), hint.value());
-                }
-            }
-
-            QueryHint queryHintAnnotation = AnnotationUtils.findAnnotation(method, QueryHint.class);
-
-            if (queryHintAnnotation != null) {
-                queryHints.put(queryHintAnnotation.name(), queryHintAnnotation.value());
-            }
-
-            return Collections.unmodifiableMap(queryHints);
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.support.CrudMethodMetadata#getLockModeType()
-         */
-        @Override
-        public LockModeType getLockModeType() {
-            return lockModeType;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.support.CrudMethodMetadata#getQueryHints()
-         */
-        @Override
-        public Map<String, Object> getQueryHints() {
-            return queryHints;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.support.CrudMethodMetadata#getEntityGraph()
-         */
-        @Override
-        public EntityGraph getEntityGraph() {
-            return entityGraph;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see com.blazebit.persistence.spring.data.impl.repository.EntityViewAwareCrudMethodMetadata#getEntityViewClass()
-         */
-        @Override
-        public Class<?> getEntityViewClass() {
-            return entityViewClass;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.data.jpa.repository.support.CrudMethodMetadata#getMethod()
-         */
-        @Override
-        public Method getMethod() {
-            return method;
-        }
-    }
-
-    /**
-     * @author Oliver Gierke
-     * @author Thomas Darimont
-     * @author Christoph Strobl
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class ThreadBoundTargetSource implements TargetSource {
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.aop.TargetSource#getTargetClass()
-         */
-        @Override
-        public Class<?> getTargetClass() {
-            return EntityViewAwareCrudMethodMetadata.class;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.aop.TargetSource#isStatic()
-         */
-        @Override
-        public boolean isStatic() {
-            return false;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.aop.TargetSource#getTarget()
-         */
-        @Override
-        public Object getTarget() throws Exception {
-
-            MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation();
-            return TransactionSynchronizationManager.getResource(invocation.getMethod());
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.springframework.aop.TargetSource#releaseTarget(java.lang.Object)
-         */
-        @Override
-        public void releaseTarget(Object target) throws Exception {
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/BlazeSpecification.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/BlazeSpecification.java
deleted file mode 100644
index b64e5a5b7b..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/BlazeSpecification.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.CriteriaBuilder;
-
-/**
- * @author Moritz Becker
- * @since 1.4.0
- */
-public interface BlazeSpecification {
-
-    void applySpecification(String rootAlias, CriteriaBuilder<?> builder);
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewReplacingMethodInterceptor.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewReplacingMethodInterceptor.java
deleted file mode 100644
index ec26efc939..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewReplacingMethodInterceptor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.type.BasicDirtyTracker;
-import com.blazebit.persistence.view.spi.type.EntityViewProxy;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author Christian Beikov
- * @since 1.3.0
- */
-public class EntityViewReplacingMethodInterceptor implements MethodInterceptor, RepositoryProxyPostProcessor {
-
-    private final EntityManager em;
-    private final EntityViewManager evm;
-
-    public EntityViewReplacingMethodInterceptor(EntityManager em, EntityViewManager evm) {
-        this.em = em;
-        this.evm = evm;
-    }
-
-    @Override
-    public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) {
-        factory.addAdvice(this);
-    }
-
-    @Override
-    public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable {
-        Object o = invocation.proceed();
-
-        if (invocation.getMethod().getName().startsWith("save")) {
-            Object[] arguments = invocation.getArguments();
-            if (arguments.length == 1) {
-                arguments[0] = convertToEntity(arguments[0]);
-            } else {
-                return convertToEntity(o);
-            }
-        }
-
-        return o;
-    }
-
-    private Object convertToEntity(Object entityOrView) {
-        if (entityOrView instanceof BasicDirtyTracker) {
-            EntityViewProxy view = (EntityViewProxy) entityOrView;
-            return evm.getEntityReference(em, view);
-        }
-        return entityOrView;
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewRepository.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewRepository.java
deleted file mode 100644
index 83c9f67a53..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewRepository.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.Repository;
-
-import java.io.Serializable;
-
-/**
- * Base entity view repository interface.
- *
- * @param <T> Entity view type.
- * @param <ID> Entity ID type.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-@NoRepositoryBean
-public interface EntityViewRepository<T, ID extends Serializable> extends Repository<T, ID> {
-
-    /**
-     * Finds the entity view of type {@code <T>} with the given id.
-     *
-     * @param id the id of the entity view of type {@code <T>} to find
-     * @return the entity view of type {@code <T>} with the given id
-     */
-    T findOne(ID id);
-
-    /**
-     * Checks if an entity view of type {@code <T>} with the given id exists.
-     *
-     * @param id the id to check for existence
-     * @return true if an entity view of type {@code <T>} exists, else false
-     */
-    boolean exists(ID id);
-
-    /**
-     * Returns all entity views of type {@code <T>}.
-     *
-     * @return an iterator over all entity views of type {@code <T>}
-     */
-    Iterable<T> findAll();
-
-    /**
-     * Finds all entity views of type {@code <T>} with the given ids.
-     *
-     * @param idIterable the ids of the entity views of type {@code <T>} to find
-     * @return an iterator over the entity views of type {@code <T>}
-     */
-    Iterable<T> findAll(Iterable<ID> idIterable);
-
-    /**
-     * Gets the number of existing entity views.of type {@code <T>}.
-     *
-     * @return the number of existing entity views of type {@code <T>}
-     */
-    long count();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSettingProcessor.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSettingProcessor.java
deleted file mode 100644
index 1652b19771..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSettingProcessor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.view.EntityViewSetting;
-
-/**
- * @author Giovanni Lovato
- * @since 1.3.0
- */
-public interface EntityViewSettingProcessor<T> {
-
-    /**
-     * Processes the {@link EntityViewSetting} to allow additional Entity View customization during query creation.
-     *
-     * @param setting the {@link EntityViewSetting} to be processed
-     * @return the final {@link EntityViewSetting} to allow further processing
-     */
-    EntityViewSetting<? extends T, ?> acceptEntityViewSetting(EntityViewSetting<T, ?> setting);
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
deleted file mode 100644
index cc8e4258a9..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/EntityViewSpecificationExecutor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-
-import java.util.List;
-
-/**
- * Like {@link org.springframework.data.jpa.repository.JpaSpecificationExecutor} but allows to specify an entity view
- * return type.
- *
- * @param <V> The view type
- * @param <E> The entity type
- * @author Moritz Becker
- * @since 1.2.0
- */
-public interface EntityViewSpecificationExecutor<V, E> {
-
-    /**
-     * Returns a single view matching the given {@link Specification}.
-     *
-     * @param spec The specification for filtering
-     * @return The matching view
-     */
-    V findOne(Specification<E> spec);
-
-    /**
-     * Returns all views matching the given {@link Specification}.
-     *
-     * @param spec The specification for filtering
-     * @return All matching views
-     */
-    List<V> findAll(Specification<E> spec);
-
-    /**
-     * Returns a {@link Page} of views matching the given {@link Specification}.
-     *
-     * @param spec The specification for filtering
-     * @param pageable The pagination information
-     * @return The requested page of matching views
-     */
-    Page<V> findAll(Specification<E> spec, Pageable pageable);
-
-    /**
-     * Returns all views matching the given {@link Specification} in the order defined by {@link Sort}.
-     *
-     * @param spec The specification for filtering
-     * @param sort The sort order definition
-     * @return All matching views in the requested order
-     */
-    List<V> findAll(Specification<E> spec, Sort sort);
-
-    /**
-     * Returns the number of instances that the given {@link Specification} will return.
-     *
-     * @param spec the {@link Specification} to count instances for
-     * @return the number of instances
-     */
-    long count(Specification<E> spec);
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwarePage.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwarePage.java
deleted file mode 100644
index 35fbbdded2..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwarePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.KeysetPage;
-import org.springframework.data.domain.Page;
-
-/**
- * Like {@link Page} but contains keyset information.
- *
- * @param <T> Element type.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface KeysetAwarePage<T> extends Page<T>, KeysetAwareSlice<T> {
-
-    /**
-     * Returns the keyset page associated to the results of this page.
-     *
-     * @return The keyset page
-     */
-    public KeysetPage getKeysetPage();
-
-    @Override
-    KeysetPageable nextPageable();
-
-    @Override
-    KeysetPageable previousPageable();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwareSlice.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwareSlice.java
deleted file mode 100644
index d108126e22..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetAwareSlice.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.KeysetPage;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Slice;
-
-/**
- * Like {@link Page} but contains keyset information.
- *
- * @param <T> Element type.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface KeysetAwareSlice<T> extends Slice<T> {
-
-    /**
-     * Returns the keyset page associated to the results of this page.
-     *
-     * @return The keyset page
-     */
-    public KeysetPage getKeysetPage();
-
-    @Override
-    KeysetPageable nextPageable();
-
-    @Override
-    KeysetPageable previousPageable();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageRequest.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageRequest.java
deleted file mode 100644
index 12da33b6aa..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageRequest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.KeysetPage;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-/**
- * Like {@link org.springframework.data.domain.PageRequest} but with support for keyset pagination.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class KeysetPageRequest extends PageRequest implements KeysetPageable {
-
-    private final KeysetPage keysetPage;
-    private final int offset;
-    private final boolean withCountQuery;
-    private final boolean withExtractAllKeysets;
-
-    /**
-     * Construct a page request with an optional keyset page that may be used for keyset pagination.
-     *
-     * @param page       The page number, 0-based
-     * @param pageSize   The number of elements per page
-     * @param keysetPage The keyset page
-     * @param sort       The sort specification
-     */
-    public KeysetPageRequest(int page, int pageSize, KeysetPage keysetPage, Sort sort) {
-        this(keysetPage, sort, page * pageSize, pageSize);
-    }
-
-    /**
-     * Construct a page request from a pageable with an optional keyset page that may be used for keyset pagination.
-     *
-     * @param keysetPage The keyset page
-     * @param pageable   The pageable
-     */
-    public KeysetPageRequest(KeysetPage keysetPage, Pageable pageable) {
-        this(keysetPage, pageable.getSort(), pageable.getPageNumber() * pageable.getPageSize(), pageable.getPageSize());
-    }
-
-    /**
-     * Construct a page request representing the current page via a keyset page and a sort specification.
-     *
-     * @param keysetPage The keyset page
-     * @param sort       The sort specification
-     */
-    public KeysetPageRequest(KeysetPage keysetPage, Sort sort) {
-        this(keysetPage, sort, keysetPage.getFirstResult(), keysetPage.getMaxResults());
-    }
-
-    /**
-     * Construct a page request with an optional keyset page that may be used for keyset pagination.
-     *
-     * @param keysetPage The keyset page
-     * @param sort       The sort specification
-     * @param offset     The offset number, 0-based
-     * @param pageSize   The number of elements per page
-     * @since 1.3.0
-     */
-    public KeysetPageRequest(KeysetPage keysetPage, Sort sort, int offset, int pageSize) {
-        this(keysetPage, sort, offset, pageSize, true, false);
-    }
-
-    /**
-     * Construct a page request with an optional keyset page that may be used for keyset pagination and flags to enable the count query and keyset extraction.
-     *
-     * @param keysetPage The keyset page
-     * @param sort       The sort specification
-     * @param offset     The offset number, 0-based
-     * @param pageSize   The number of elements per page
-     * @param withCountQuery True to enable the count query
-     * @param withExtractAllKeysets True to enable extraction of all keysets
-     * @since 1.4.0
-     */
-    public KeysetPageRequest(KeysetPage keysetPage, Sort sort, int offset, int pageSize, boolean withCountQuery, boolean withExtractAllKeysets) {
-        super(offset / pageSize, pageSize, sort);
-        this.keysetPage = keysetPage;
-        this.offset = offset;
-        this.withCountQuery = withCountQuery;
-        this.withExtractAllKeysets = withExtractAllKeysets;
-    }
-
-    @Override
-    public boolean isWithCountQuery() {
-        return withCountQuery;
-    }
-
-    @Override
-    public boolean isWithExtractAllKeysets() {
-        return withExtractAllKeysets;
-    }
-
-    @Override
-    public int getIntOffset() {
-        return offset;
-    }
-
-
-    @Override
-    public KeysetPage getKeysetPage() {
-        return keysetPage;
-    }
-
-    @Override
-    // Since we compile with Spring Data 1.11 as basis, we need to generate only the bridge for PageRequest
-    @WithBridgeMethods({PageRequest.class})
-//    @WithBridgeMethods({Pageable.class})
-    public KeysetPageRequest next() {
-        return new KeysetPageRequest(keysetPage, getSort(), getIntOffset() + getPageSize(), getPageSize(), isWithCountQuery(), isWithExtractAllKeysets());
-    }
-
-    @Override
-    // Since we compile with Spring Data 1.11 as basis, we need to generate only the bridge for PageRequest
-    @WithBridgeMethods({PageRequest.class})
-//    @WithBridgeMethods({Pageable.class})
-    public KeysetPageRequest previousOrFirst() {
-        if (getIntOffset() == 0) {
-            return this;
-        }
-        return new KeysetPageRequest(keysetPage, getSort(), getIntOffset() - getPageSize(), getPageSize(), isWithCountQuery(), isWithExtractAllKeysets());
-    }
-
-    @Override
-    // Since we compile with Spring Data 1.11 as basis, we need to generate only the bridge for PageRequest
-    @WithBridgeMethods({PageRequest.class})
-//    @WithBridgeMethods({Pageable.class})
-    public KeysetPageRequest first() {
-        if (getIntOffset() == 0) {
-            return this;
-        }
-        return new KeysetPageRequest(keysetPage, getSort(), 0, getPageSize(), isWithCountQuery(), isWithExtractAllKeysets());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof KeysetPageable)) {
-            return false;
-        }
-
-        KeysetPageable that = (KeysetPageable) o;
-
-        if (isWithCountQuery() != that.isWithCountQuery()) {
-            return false;
-        }
-        if (isWithExtractAllKeysets() != that.isWithExtractAllKeysets()) {
-            return false;
-        }
-        if (getIntOffset() != that.getIntOffset()) {
-            return false;
-        }
-        if (getPageSize() != that.getPageSize()) {
-            return false;
-        }
-        if (getKeysetPage() != null ? !getKeysetPage().equals(that.getKeysetPage()) : that.getKeysetPage() != null) {
-            return false;
-        }
-        return getSort() != null ? getSort().equals(that.getSort()) : that.getSort() == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getKeysetPage() != null ? getKeysetPage().hashCode() : 0;
-        result = 31 * result + (getSort() != null ? getSort().hashCode() : 0);
-        result = 31 * result + (isWithCountQuery() ? 1 : 0);
-        result = 31 * result + (isWithExtractAllKeysets() ? 1 : 0);
-        result = 31 * result + getIntOffset();
-        result = 31 * result + getPageSize();
-        return result;
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageable.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageable.java
deleted file mode 100644
index 56e48caa77..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/KeysetPageable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository;
-
-import com.blazebit.persistence.KeysetPage;
-import org.springframework.data.domain.Pageable;
-
-/**
- * Like {@link Pageable} but contains keyset information.
- *
- * @author Christian Beikov
- * @since 1.2.0
- */
-public interface KeysetPageable extends Pageable {
-
-    /**
-     * Returns the keyset page information.
-     *
-     * @return The keyset page
-     */
-    public KeysetPage getKeysetPage();
-
-    /**
-     * Returns whether count query execution is enabled or not.
-     *
-     * @return true when enabled, false otherwise
-     * @since 1.4.0
-     */
-    public boolean isWithCountQuery();
-
-    /**
-     * Returns whether extraction for all keysets is enabled or not.
-     *
-     * @return true when enabled, false otherwise
-     * @since 1.4.0
-     */
-    public boolean isWithExtractAllKeysets();
-
-    /**
-     * Returns the offset as int.
-     *
-     * @return The offset as int
-     * @since 1.3.0
-     */
-    public int getIntOffset();
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoriesRegistrar.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoriesRegistrar.java
deleted file mode 100644
index 7abee4fb8b..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoriesRegistrar.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository.config;
-
-import org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @author Christian Beikov
- * @since 1.6.8
- */
-public class BlazeRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
-
-    @Override
-    protected Class<? extends Annotation> getAnnotation() {
-        return EnableBlazeRepositories.class;
-    }
-
-    @Override
-    protected RepositoryConfigurationExtension getExtension() {
-        return new BlazeRepositoryConfigExtension();
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoryConfigExtension.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoryConfigExtension.java
deleted file mode 100644
index fb5c21a393..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/BlazeRepositoryConfigExtension.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository.config;
-
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
-import com.blazebit.persistence.view.EntityView;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.config.JpaRepositoryConfigExtension;
-import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
-import org.springframework.data.repository.config.RepositoryConfigurationSource;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * @author Christian Beikov
- * @since 1.6.8
- */
-public class BlazeRepositoryConfigExtension extends JpaRepositoryConfigExtension {
-    @Override
-    public String getModuleName() {
-        return "Blaze-Persistence";
-    }
-
-    public String getRepositoryFactoryClassName() {
-        return getRepositoryFactoryBeanClassName();
-    }
-
-    public String getRepositoryFactoryBeanClassName() {
-        return "com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean";
-    }
-
-    @Override
-    protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
-        return Arrays.asList(Entity.class, MappedSuperclass.class, EntityView.class);
-    }
-
-    @Override
-    protected Collection<Class<?>> getIdentifyingTypes() {
-        return Arrays.asList(JpaRepository.class, EntityViewRepository.class, EntityViewSpecificationExecutor.class);
-    }
-
-    @Override
-    public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource config) {
-        AnnotationAttributes attributes = ((AnnotationRepositoryConfigurationSource) config).getAttributes();
-        if (attributes.get("repositoryFactoryBeanClass") == void.class) {
-            try {
-                attributes.put("repositoryFactoryBeanClass", Class.forName(getRepositoryFactoryBeanClassName()));
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        super.registerBeansForRoot(registry, config);
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/EnableBlazeRepositories.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/EnableBlazeRepositories.java
deleted file mode 100644
index fd66e7eaf3..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/config/EnableBlazeRepositories.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.repository.config;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.data.repository.config.BootstrapMode;
-import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import javax.persistence.EntityManagerFactory;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to enable Blaze repositories. Will scan the package of the annotated configuration class for Spring Data
- * repositories by default.
- *
- * Like {@link org.springframework.data.jpa.repository.config.EnableJpaRepositories}, but with a custom registrar.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christian Beikov
- * @since 1.6.8
- * @see org.springframework.data.jpa.repository.config.EnableJpaRepositories
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(BlazeRepositoriesRegistrar.class)
-public @interface EnableBlazeRepositories {
-
-    /**
-     * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.:
-     * {@code @EnableBlazeRepositories("org.my.pkg")} instead of {@code @EnableBlazeRepositories(basePackages="org.my.pkg")}.
-     */
-    String[] value() default {};
-
-    /**
-     * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this
-     * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
-     */
-    String[] basePackages() default {};
-
-    /**
-     * Type-safe alternative to {@link #basePackages()} for specifying the packages to scan for annotated components. The
-     * package of each class specified will be scanned. Consider creating a special no-op marker class or interface in
-     * each package that serves no purpose other than being referenced by this attribute.
-     */
-    Class<?>[] basePackageClasses() default {};
-
-    /**
-     * Specifies which types are eligible for component scanning. Further narrows the set of candidate components from
-     * everything in {@link #basePackages()} to everything in the base packages that matches the given filter or filters.
-     */
-    ComponentScan.Filter[] includeFilters() default {};
-
-    /**
-     * Specifies which types are not eligible for component scanning.
-     */
-    ComponentScan.Filter[] excludeFilters() default {};
-
-    /**
-     * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl}. So
-     * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
-     * for {@code PersonRepositoryImpl}.
-     */
-    String repositoryImplementationPostfix() default "Impl";
-
-    /**
-     * Configures the location of where to find the Spring Data named queries properties file. Will default to
-     * {@code META-INF/jpa-named-queries.properties}.
-     */
-    String namedQueriesLocation() default "";
-
-    /**
-     * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
-     * {@link QueryLookupStrategy.Key#CREATE_IF_NOT_FOUND}.
-     */
-    QueryLookupStrategy.Key queryLookupStrategy() default QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND;
-
-    /**
-     * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
-     * {@code com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean}.
-     */
-    Class<?> repositoryFactoryBeanClass() default void.class;
-
-    /**
-     * Configure the repository base class to be used to create repository proxies for this particular configuration.
-     */
-    Class<?> repositoryBaseClass() default DefaultRepositoryBaseClass.class;
-
-    // JPA specific configuration
-
-    /**
-     * Configures the name of the {@link EntityManagerFactory} bean definition to be used to create repositories
-     * discovered through this annotation. Defaults to {@code entityManagerFactory}.
-     */
-    String entityManagerFactoryRef() default "entityManagerFactory";
-
-    /**
-     * Configures the name of the {@link PlatformTransactionManager} bean definition to be used to create repositories
-     * discovered through this annotation. Defaults to {@code transactionManager}.
-     */
-    String transactionManagerRef() default "transactionManager";
-
-    /**
-     * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
-     * repositories infrastructure.
-     */
-    boolean considerNestedRepositories() default false;
-
-    /**
-     * Configures whether to enable default transactions for Spring Data JPA repositories. Defaults to {@literal true}. If
-     * disabled, repositories must be used behind a facade that's configuring transactions (e.g. using Spring's annotation
-     * driven transaction facilities) or repository methods have to be used to demarcate transactions.
-     *
-     * @return whether to enable default transactions, defaults to {@literal true}.
-     */
-    boolean enableDefaultTransactions() default true;
-
-    /**
-     * Configures when the repositories are initialized in the bootstrap lifecycle. {@link BootstrapMode#DEFAULT}
-     * (default) means eager initialization except all repository interfaces annotated with {@link Lazy},
-     * {@link BootstrapMode#LAZY} means lazy by default including injection of lazy-initialization proxies into client
-     * beans so that those can be instantiated but will only trigger the initialization upon first repository usage (i.e a
-     * method invocation on it). This means repositories can still be uninitialized when the application context has
-     * completed its bootstrap. {@link BootstrapMode#DEFERRED} is fundamentally the same as {@link BootstrapMode#LAZY},
-     * but triggers repository initialization when the application context finishes its bootstrap.
-     */
-    BootstrapMode bootstrapMode() default BootstrapMode.DEFAULT;
-
-    /**
-     * Configures what character is used to escape the wildcards {@literal _} and {@literal %} in derived queries with
-     * {@literal contains}, {@literal startsWith} or {@literal endsWith} clauses.
-     *
-     * @return a single character used for escaping.
-     */
-    char escapeCharacter() default '\\';
-}
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/package-info.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/package-info.java
deleted file mode 100644
index 86da340fcf..0000000000
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/repository/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-/**
- * Blaze-Persistence Spring-Data integration.
- *
- * @author Moritz Becker
- * @since 1.2.0
- */
-package com.blazebit.persistence.spring.data.repository;
\ No newline at end of file
diff --git a/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java b/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
deleted file mode 100644
index 9158bd6409..0000000000
--- a/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaCountQueryCreator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package org.springframework.data.jpa.repository.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.query.parser.PartTree;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class FixedJpaCountQueryCreator extends FixedJpaQueryCreator {
-
-    public FixedJpaCountQueryCreator(PartTree tree, Class<?> domainClass, CriteriaBuilder builder,
-                                     ParameterMetadataProvider provider) {
-        super(tree, domainClass, builder, provider);
-    }
-
-    @Override
-    protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort, CriteriaQuery<Object> query,
-                                             CriteriaBuilder builder, Root<?> root) {
-        CriteriaQuery<Object> select = query.select(query.isDistinct() ? builder.countDistinct(root) : builder.count(root));
-        return predicate == null ? select : select.where(predicate);
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java b/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
deleted file mode 100644
index 20f29d3b13..0000000000
--- a/integration/spring-data/base/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright 2014 - 2024 Blazebit.
- * Copyright 2010-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.jpa.repository.query;
-
-import com.blazebit.persistence.spring.data.base.query.ParameterMetadataProvider;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.repository.query.parser.AbstractQueryCreator;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.util.Assert;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.springframework.data.jpa.repository.query.QueryUtils.toExpressionRecursively;
-import static org.springframework.data.repository.query.parser.Part.Type.NOT_CONTAINING;
-import static org.springframework.data.repository.query.parser.Part.Type.NOT_LIKE;
-
-/**
- * Query creator to create a {@link CriteriaQuery} from a {@link PartTree}.
- *
- * Moritz Becker: Changed inner PredicateBuilder to work around an EclipseLink bug.
- *
- * @author Oliver Gierke
- * @author Moritz Becker
- *
- * @since 1.2.0
- */
-public class FixedJpaQueryCreator extends AbstractQueryCreator<CriteriaQuery<Object>, Predicate> {
-    private final CriteriaBuilder builder;
-    private final Root<?> root;
-    private final CriteriaQuery<Object> query;
-    private final ParameterMetadataProvider provider;
-
-    public FixedJpaQueryCreator(PartTree tree, Class<?> domainClass, CriteriaBuilder builder,
-                           ParameterMetadataProvider provider) {
-        super(tree);
-
-        this.builder = builder;
-        this.query = builder.createQuery().distinct(tree.isDistinct());
-        this.root = query.from(domainClass);
-        this.provider = provider;
-    }
-
-    /**
-     * Returns all {@link javax.persistence.criteria.ParameterExpression} created when creating the query.
-     *
-     * @return the parameterExpressions
-     */
-    public List<ParameterMetadataProvider.ParameterMetadata<?>> getParameterExpressions() {
-        return provider.getExpressions();
-    }
-
-    @Override
-    protected Predicate create(Part part, Iterator<Object> iterator) {
-        return toPredicate(part, root);
-    }
-
-    @Override
-    protected Predicate and(Part part, Predicate base, Iterator<Object> iterator) {
-        return builder.and(base, toPredicate(part, root));
-    }
-
-    @Override
-    protected Predicate or(Predicate base, Predicate predicate) {
-        return builder.or(base, predicate);
-    }
-
-    /**
-     * Finalizes the given {@link Predicate} and applies the given sort. Delegates to
-     * {@link #complete(Predicate, Sort, CriteriaQuery, CriteriaBuilder, Root)} and hands it the current {@link CriteriaQuery}
-     * and {@link CriteriaBuilder}.
-     */
-    @Override
-    protected final CriteriaQuery<Object> complete(Predicate predicate, Sort sort) {
-        return complete(predicate, sort, query, builder, root);
-    }
-
-    /**
-     * Template method to finalize the given {@link Predicate} using the given {@link CriteriaQuery} and
-     * {@link CriteriaBuilder}.
-     *
-     * @param predicate
-     * @param sort
-     * @param query
-     * @param builder
-     * @return
-     */
-    protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort, CriteriaQuery<Object> query,
-                                             CriteriaBuilder builder, Root<?> root) {
-        CriteriaQuery<Object> select = this.query.select(root).orderBy(QueryUtils.toOrders(sort, root, builder));
-        return predicate == null ? select : select.where(predicate);
-    }
-
-    /**
-     * Creates a {@link Predicate} from the given {@link Part}.
-     *
-     * @param part
-     * @param root
-     * @return
-     */
-    private Predicate toPredicate(Part part, Root<?> root) {
-        return new FixedJpaQueryCreator.PredicateBuilder(part, root).build();
-    }
-
-    /**
-     * Simple builder to contain logic to create JPA {@link Predicate}s from {@link Part}s.
-     *
-     * Moritz Becker: Rewrote NOT and NOT_IN cases to explicitely cast criteria IN argument to Expression&lt;Collection&lt;?&gt;&gt; which is needed
-     * to work around an EclipseLink bug.
-     *
-     * @author Phil Webb
-     * @author Oliver Gierke
-     * @author Moritz Becker
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private class PredicateBuilder {
-
-        private final Part part;
-        private final Root<?> root;
-
-        /**
-         * Creates a new {@link JpaQueryCreator.PredicateBuilder} for the given {@link Part} and {@link Root}.
-         *
-         * @param part must not be {@literal null}.
-         * @param root must not be {@literal null}.
-         */
-        public PredicateBuilder(Part part, Root<?> root) {
-
-            Assert.notNull(part);
-            Assert.notNull(root);
-            this.part = part;
-            this.root = root;
-        }
-
-        /**
-         * Builds a JPA {@link Predicate} from the underlying {@link Part}.
-         *
-         * @return
-         */
-        public <X> Predicate build() {
-
-            PropertyPath property = part.getProperty();
-            Part.Type type = part.getType();
-
-            switch (type) {
-                case BETWEEN:
-                    ParameterMetadataProvider.ParameterMetadata<Comparable> first = provider.next(part);
-                    ParameterMetadataProvider.ParameterMetadata<Comparable> second = provider.next(part);
-                    return builder.between(getComparablePath(root, part), first.getExpression(), second.getExpression());
-                case AFTER:
-                case GREATER_THAN:
-                    return builder.greaterThan(getComparablePath(root, part),
-                            provider.next(part, Comparable.class).getExpression());
-                case GREATER_THAN_EQUAL:
-                    return builder.greaterThanOrEqualTo(getComparablePath(root, part),
-                            provider.next(part, Comparable.class).getExpression());
-                case BEFORE:
-                case LESS_THAN:
-                    return builder.lessThan(getComparablePath(root, part), provider.next(part, Comparable.class).getExpression());
-                case LESS_THAN_EQUAL:
-                    return builder.lessThanOrEqualTo(getComparablePath(root, part),
-                            provider.next(part, Comparable.class).getExpression());
-                case IS_NULL:
-                    return getTypedPath(root, part).isNull();
-                case IS_NOT_NULL:
-                    return getTypedPath(root, part).isNotNull();
-                /************************************************
-                 * Moritz Becker:
-                 * Added cast to Expression<Collection<?>> to work around an EclipseLink bug.
-                 ************************************************/
-                case NOT_IN:
-                    return getTypedPath(root, part).in((Expression<Collection<?>>) provider.next(part, Collection.class).getExpression()).not();
-                case IN:
-                    return getTypedPath(root, part).in((Expression<Collection<?>>) provider.next(part, Collection.class).getExpression());
-                /************************************************
-                 * end of changes
-                 ************************************************/
-                //CHECKSTYLE:OFF: checkstyle:FallThrough
-                case STARTING_WITH:
-                case ENDING_WITH:
-                case CONTAINING:
-                case NOT_CONTAINING:
-
-                    if (property.getLeafProperty().isCollection()) {
-
-                        Expression<Collection<X>> propertyExpression = traversePath(root, property);
-                        Expression<X> parameterExpression = (Expression<X>) provider.next(part).getExpression();
-
-                        // Can't just call .not() in case of negation as EclipseLink chokes on that.
-                        return type.equals(NOT_CONTAINING) ? builder.isNotMember(parameterExpression, propertyExpression)
-                                : builder.isMember(parameterExpression, propertyExpression);
-                    }
-                //CHECKSTYLE:OFF: checkstyle:FallThrough
-                case LIKE:
-                case NOT_LIKE:
-                    Expression<String> stringPath = getTypedPath(root, part);
-                    Expression<String> propertyExpression = upperIfIgnoreCase(stringPath);
-                    Expression<String> parameterExpression = upperIfIgnoreCase(provider.next(part, String.class).getExpression());
-                    Predicate like = builder.like(propertyExpression, parameterExpression);
-                    return type.equals(NOT_LIKE) || type.equals(NOT_CONTAINING) ? like.not() : like;
-                case TRUE:
-                    Expression<Boolean> truePath = getTypedPath(root, part);
-                    return builder.isTrue(truePath);
-                case FALSE:
-                    Expression<Boolean> falsePath = getTypedPath(root, part);
-                    return builder.isFalse(falsePath);
-                case SIMPLE_PROPERTY:
-                    ParameterMetadataProvider.ParameterMetadata<Object> expression = provider.next(part);
-                    Expression<Object> path = getTypedPath(root, part);
-                    return expression.isIsNullParameter() ? path.isNull()
-                            : builder.equal(upperIfIgnoreCase(path), upperIfIgnoreCase(expression.getExpression()));
-                case NEGATING_SIMPLE_PROPERTY:
-                    return builder.notEqual(upperIfIgnoreCase(getTypedPath(root, part)),
-                            upperIfIgnoreCase(provider.next(part).getExpression()));
-                default:
-                    throw new IllegalArgumentException("Unsupported keyword " + type);
-            }
-        }
-
-        /**
-         * Applies an {@code UPPERCASE} conversion to the given {@link Expression} in case the underlying {@link Part}
-         * requires ignoring case.
-         *
-         * @param expression must not be {@literal null}.
-         * @return
-         */
-        private <T> Expression<T> upperIfIgnoreCase(Expression<? extends T> expression) {
-
-            switch (part.shouldIgnoreCase()) {
-
-                case ALWAYS:
-
-                    Assert.state(canUpperCase(expression), "Unable to ignore case of " + expression.getJavaType().getName()
-                            + " types, the property '" + part.getProperty().getSegment() + "' must reference a String");
-                    return (Expression<T>) builder.upper((Expression<String>) expression);
-
-                case WHEN_POSSIBLE:
-
-                    if (canUpperCase(expression)) {
-                        return (Expression<T>) builder.upper((Expression<String>) expression);
-                    }
-
-                case NEVER:
-                default:
-
-                    return (Expression<T>) expression;
-            }
-        }
-
-        private boolean canUpperCase(Expression<?> expression) {
-            return String.class.equals(expression.getJavaType());
-        }
-
-        /**
-         * Returns a path to a {@link Comparable}.
-         *
-         * @param root
-         * @param part
-         * @return
-         */
-        private Expression<? extends Comparable> getComparablePath(Root<?> root, Part part) {
-            return getTypedPath(root, part);
-        }
-
-        private <T> Expression<T> getTypedPath(Root<?> root, Part part) {
-            return toExpressionRecursively(root, part.getProperty());
-        }
-
-        private <T> Expression<T> traversePath(Path<?> root, PropertyPath path) {
-
-            Path<Object> result = root.get(path.getSegment());
-            return (Expression<T>) (path.hasNext() ? traversePath(result, path.next()) : result);
-        }
-    }
-}
diff --git a/integration/spring-data/base/src/main/java/org/springframework/data/repository/config/BootstrapMode.java b/integration/spring-data/base/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
deleted file mode 100644
index 1e43e9e27b..0000000000
--- a/integration/spring-data/base/src/main/java/org/springframework/data/repository/config/BootstrapMode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2018-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.repository.config;
-
-/**
- * Enumeration to define in which way repositories are bootstrapped.
- *
- * @author Oliver Gierke
- * @see RepositoryConfigurationSource#getBootstrapMode()
- * @since 2.1
- * @soundtrack Dave Matthews Band - She (Come Tomorrow)
- */
-public enum BootstrapMode {
-
-	/**
-	 * Repository proxies are instantiated eagerly, just like any other Spring bean, except explicitly marked as lazy.
-	 * Thus, injection into repository clients will trigger initialization.
-	 */
-	DEFAULT,
-
-	/**
-	 * Repository bean definitions are considered lazy and clients will get repository proxies injected that will
-	 * initialize on first access. Repository initialization is triggered on application context bootstrap completion.
-	 */
-	DEFERRED,
-
-	/**
-	 * Repository bean definitions are considered lazy, lazily inject and only initialized on first use, i.e. the
-	 * application might have fully started without the repositories initialized.
-	 */
-	LAZY;
-}
diff --git a/integration/spring-data/pom.xml b/integration/spring-data/pom.xml
index 0b74b2ea6d..8e6beccb08 100644
--- a/integration/spring-data/pom.xml
+++ b/integration/spring-data/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,53 +20,12 @@
     <name>Blazebit Persistence Integration Spring-Data</name>
 
     <modules>
-        <module>base</module>
-<!--        <module>base-3.1</module>-->
-        <module>1.x</module>
-        <module>2.0</module>
-        <module>2.1</module>
-        <module>2.2</module>
-        <module>2.3</module>
-        <module>2.4</module>
-        <module>2.5</module>
-        <module>2.6</module>
-        <module>2.7</module>
-<!--        <module>3.1</module>-->
+        <module>base-3.1</module>
+        <module>base-3.3</module>
+        <module>3.1</module>
+        <module>3.3</module>
         <module>webmvc</module>
-<!--        <module>webmvc-jakarta</module>-->
         <module>webflux</module>
         <module>testsuite</module>
-        <module>asm-debug-all</module>
     </modules>
-
-    <!-- Spring 6 is compiled with JDK 17, so we can only compile it, if we the build is running on a JDK 17 -->
-    <profiles>
-        <profile>
-            <id>jdk17+</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <modules>
-                <module>base</module>
-                <module>base-3.1</module>
-                <module>base-3.3</module>
-                <module>1.x</module>
-                <module>2.0</module>
-                <module>2.1</module>
-                <module>2.2</module>
-                <module>2.3</module>
-                <module>2.4</module>
-                <module>2.5</module>
-                <module>2.6</module>
-                <module>2.7</module>
-                <module>3.1</module>
-                <module>3.3</module>
-                <module>webmvc</module>
-                <module>webmvc-jakarta</module>
-                <module>webflux</module>
-                <module>testsuite</module>
-                <module>asm-debug-all</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration/spring-data/testsuite/pom.xml b/integration/spring-data/testsuite/pom.xml
index 071bb33fc9..6315f42243 100644
--- a/integration/spring-data/testsuite/pom.xml
+++ b/integration/spring-data/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,27 +14,5 @@
     <modules>
         <module>webmvc</module>
         <module>webflux</module>
-<!--        <module>webmvc-jakarta</module>-->
-<!--        <module>webmvc-jakarta-runner</module>-->
-<!--        <module>webflux-jakarta</module>-->
-<!--        <module>webflux-jakarta-runner</module>-->
     </modules>
-
-    <!-- Spring 6 is compiled with JDK 17, so we can only compile it, if we the build is running on a JDK 17 -->
-    <profiles>
-        <profile>
-            <id>jdk17+</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <modules>
-                <module>webmvc</module>
-                <module>webflux</module>
-                <module>webmvc-jakarta</module>
-                <module>webmvc-jakarta-runner</module>
-                <module>webflux-jakarta</module>
-                <module>webflux-jakarta-runner</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/integration/spring-data/testsuite/webflux-jakarta-runner/pom.xml b/integration/spring-data/testsuite/webflux-jakarta-runner/pom.xml
deleted file mode 100644
index 479dfd0dc1..0000000000
--- a/integration/spring-data/testsuite/webflux-jakarta-runner/pom.xml
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-spring-data-testsuite-webflux-jakarta-runner</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webflux.runner</module.name>
-        <test.java.version>17</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <version.spring>${version.spring-data-3.3-spring}</version.spring>
-        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-        <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-        <version.h2>${h2-2.version}</version.h2>
-        <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webflux-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webflux-jakarta</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webflux</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-envers</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-testing</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jakarta-jaxb-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jakarta-jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jakarta-jta}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.jakarta-activation}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-            <version>${version.spring-boot}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${version.h2}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webflux</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>${version.spring-data}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.17.1</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson</artifactId>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${version.spring-boot}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <jdbc.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</jdbc.url>
-                        <jdbc.user>admin</jdbc.user>
-                        <jdbc.password>admin</jdbc.password>
-                        <jdbc.driver>org.h2.Driver</jdbc.driver>
-                        <user.timezone>UTC</user.timezone>
-                        <activeProfiles>hibernate</activeProfiles>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>com.blazebit:blaze-persistence-integration-spring-data-testsuite-webflux-jakarta</dependency>
-                    </dependenciesToScan>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>${version.surefire.plugin}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>hibernate-5.6</id>
-            <!--
-            Default to compiling with ORM 6.2 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.hibernate>${version.hibernate-6.5}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <!--
-            Default to compiling with Spring Data 3.1 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.2-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.3.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-3.3-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/spring-data/testsuite/webflux-jakarta/pom.xml b/integration/spring-data/testsuite/webflux-jakarta/pom.xml
deleted file mode 100644
index 72f0423b9a..0000000000
--- a/integration/spring-data/testsuite/webflux-jakarta/pom.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-spring-data-testsuite-webflux-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webflux</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webflux</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webflux:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webflux:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webflux:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webflux:jar}" regexp="\.jar$" replace="-tests.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-tests.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                    <classifier>tests</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                            <classifier>tests</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/spring-data/testsuite/webflux/pom.xml b/integration/spring-data/testsuite/webflux/pom.xml
index c90ad52f9f..9f2727122b 100644
--- a/integration/spring-data/testsuite/webflux/pom.xml
+++ b/integration/spring-data/testsuite/webflux/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,10 +14,14 @@
     <properties>
         <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webflux</module.name>
         <test.argLine />
-        <main.java.version>1.8</main.java.version>
 
-        <version.spring>${version.spring-data-2.0-spring}</version.spring>
-        <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
+        <main.java.version>17</main.java.version>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
+        <version.hibernate>${version.hibernate-6.2}</version.hibernate>
+
+        <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
     </properties>
 
     <dependencyManagement>
@@ -33,6 +37,21 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-common-utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${version.spring-data}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
@@ -48,7 +67,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -66,38 +85,27 @@
             <artifactId>blaze-persistence-entity-view-impl</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${version.servlet}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${version.spring.boot}</version>
+            <groupId>com.blazebit</groupId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${version.spring.boot}</version>
-            <scope>test</scope>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate}</version>
         </dependency>
         <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>${version.hibernate}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-testing</artifactId>
+            <version>${version.hibernate}</version>
         </dependency>
-
-        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -109,3061 +117,176 @@
             <version>${version.jaxb}</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>${version.activation-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <version>${version.spring-boot}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${version.spring-data}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-jackson</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${version.spring-boot}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <jdbc.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</jdbc.url>
+                        <jdbc.user>admin</jdbc.user>
+                        <jdbc.password>admin</jdbc.password>
+                        <jdbc.driver>org.h2.Driver</jdbc.driver>
+                        <user.timezone>UTC</user.timezone>
+                        <activeProfiles>hibernate</activeProfiles>
+                    </systemPropertyVariables>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>${version.surefire.plugin}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>${h2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <hibernate.default_schema>public</hibernate.default_schema>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://${dbHost}:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>jcc</artifactId>
-                    <version>11.5.5.0</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
-                                <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>Oracle18</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
-                                <user.country>US</user.country>
-                                <user.language>en</user.language>
-                                <!-- Dumb, dumber, Oracle -->
-                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
-                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ojdbc8</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
-                                <jdbc.user>sa</jdbc.user>
-                                <jdbc.password>Blaze-Persistence</jdbc.password>
-                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>recreate-schema</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${skipTests}</skip>
-                                    <mainClass>com.blazebit.persistence.testsuite.base.jpa.SchemaClearer</mainClass>
-                                    <systemProperties>
-                                        <systemProperty>
-                                            <key>jdbc.url</key>
-                                            <value>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.user</key>
-                                            <value>sa</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.password</key>
-                                            <value>Blaze-Persistence</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.driver</key>
-                                            <value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
-                                        </systemProperty>
-                                    </systemProperties>
-                                    <includePluginDependencies>true</includePluginDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-entitymanager</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.microsoft.sqlserver</groupId>
-                                <artifactId>mssql-jdbc</artifactId>
-                                <version>${mssql.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.microsoft.sqlserver</groupId>
-                    <artifactId>mssql-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.2</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.3</id>
+            <id>hibernate-6.6</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
+
         <profile>
-            <id>hibernate-5.4</id>
+            <id>spring-data-3.1.x</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.1-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.5</id>
+            <id>spring-data-3.2.x</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.2-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>${version.validation}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <!-- Webflux starter puts validation on the classpath so Datanucleus assumes it can initialize it but that requires the EL API also -->
-                <dependency>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                    <version>3.0.1-b08</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <!-- Webflux starter puts validation on the classpath so Datanucleus assumes it can initialize it but that requires the EL API also -->
-                <dependency>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                    <version>3.0.1-b08</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                </dependency>
-                <!-- Webflux starter puts validation on the classpath so Datanucleus assumes it can initialize it but that requires the EL API also -->
-                <dependency>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                    <version>3.0.1-b08</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-orm</artifactId>
-                    <version>${version.spring-data-1.x-spring}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.9.8</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.0-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                    <version>2.9.8</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.1-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.1.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.1 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-3.2.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.2 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-3.3.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Document.java b/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Document.java
index a0f67f09b3..0f1d760b86 100644
--- a/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Document.java
+++ b/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Document.java
@@ -5,11 +5,11 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webflux.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
diff --git a/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Person.java b/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Person.java
index b224aeabc1..c4bbd4ec5f 100644
--- a/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Person.java
+++ b/integration/spring-data/testsuite/webflux/src/main/java/com/blazebit/persistence/spring/data/testsuite/webflux/entity/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webflux.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/spring-data/testsuite/webflux/src/main/resources/META-INF/persistence.xml b/integration/spring-data/testsuite/webflux/src/main/resources/META-INF/persistence.xml
index 017d58bb75..f47b7ca334 100644
--- a/integration/spring-data/testsuite/webflux/src/main/resources/META-INF/persistence.xml
+++ b/integration/spring-data/testsuite/webflux/src/main/resources/META-INF/persistence.xml
@@ -10,7 +10,7 @@
         <class>com.blazebit.persistence.spring.data.testsuite.webflux.entity.Person</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/BlazePersistenceConfiguration.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/BlazePersistenceConfiguration.java
index db2b2a8ef5..68bb214551 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/BlazePersistenceConfiguration.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/BlazePersistenceConfiguration.java
@@ -19,8 +19,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/CustomLocalContainerEntityManagerFactoryBean.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/CustomLocalContainerEntityManagerFactoryBean.java
index cb2eeaa367..6136709594 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/CustomLocalContainerEntityManagerFactoryBean.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/config/CustomLocalContainerEntityManagerFactoryBean.java
@@ -7,8 +7,8 @@
 
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
 import java.util.Properties;
 
 /**
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/DocumentRepository.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/DocumentRepository.java
index 216b664772..b31364740f 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/DocumentRepository.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/DocumentRepository.java
@@ -10,7 +10,7 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/ModificationPersonRepositoryImpl.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/ModificationPersonRepositoryImpl.java
index 776c6e1b34..5fdb4659e2 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/ModificationPersonRepositoryImpl.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/repository/ModificationPersonRepositoryImpl.java
@@ -11,7 +11,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TransactionalWorkService.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TransactionalWorkService.java
index 255773afce..7ad3efbd13 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TransactionalWorkService.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TransactionalWorkService.java
@@ -10,7 +10,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxVoidWork.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxVoidWork.java
index f1bb910b39..53958585ad 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxVoidWork.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxVoidWork.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxWork.java b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxWork.java
index 1603d82536..3d46019712 100644
--- a/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxWork.java
+++ b/integration/spring-data/testsuite/webflux/src/test/java/com/blazebit/persistence/spring/data/testsuite/webflux/tx/TxWork.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webflux/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webflux/application-config.xml b/integration/spring-data/testsuite/webflux/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webflux/application-config.xml
index ee9465b62e..6c229ca117 100644
--- a/integration/spring-data/testsuite/webflux/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webflux/application-config.xml
+++ b/integration/spring-data/testsuite/webflux/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webflux/application-config.xml
@@ -26,10 +26,10 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
                     <prop key="hibernate.show_sql">false</prop>
 
                     <!-- required for Hibernate 4.2 -->
@@ -54,11 +54,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             </property>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                     <prop key="eclipselink.logging.level">OFF</prop> <!-- use FINE for debugging -->
                 </props>
             </property>
@@ -71,11 +71,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
@@ -89,11 +89,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
diff --git a/integration/spring-data/testsuite/webmvc-jakarta-runner/pom.xml b/integration/spring-data/testsuite/webmvc-jakarta-runner/pom.xml
deleted file mode 100644
index 3c20a3c334..0000000000
--- a/integration/spring-data/testsuite/webmvc-jakarta-runner/pom.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta-runner</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webmvc.runner</module.name>
-        <test.java.version>17</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <version.spring>${version.spring-data-3.3-spring}</version.spring>
-        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-        <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-        <version.h2>${h2-2.version}</version.h2>
-        <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-envers</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-testing</artifactId>
-            <version>${version.hibernate}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jakarta-jaxb-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jakarta-jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-            <version>${version.jakarta-jta}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.jakarta-activation}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${version.h2}</version>
-            <scope>test</scope>
-        </dependency>
-
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${version.jakarta-servlet}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.17.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.17.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <jdbc.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</jdbc.url>
-                        <jdbc.user>admin</jdbc.user>
-                        <jdbc.password>admin</jdbc.password>
-                        <jdbc.driver>org.h2.Driver</jdbc.driver>
-                        <user.timezone>UTC</user.timezone>
-                        <activeProfiles>hibernate</activeProfiles>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta</dependency>
-                    </dependenciesToScan>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>${version.surefire.plugin}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>hibernate-5.6</id>
-            <!--
-            Default to compiling with ORM 6.2 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.hibernate>${version.hibernate-6.5}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <!--
-            Default to compiling with Spring Data 3.1 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.2-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.3.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-3.3-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/spring-data/testsuite/webmvc-jakarta/pom.xml b/integration/spring-data/testsuite/webmvc-jakarta/pom.xml
deleted file mode 100644
index 6d7da721ed..0000000000
--- a/integration/spring-data/testsuite/webmvc-jakarta/pom.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webmvc</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-testsuite-webmvc</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc:jar}" regexp="\.jar$" replace="-tests.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-tests.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                    <classifier>tests</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                            <classifier>tests</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration/spring-data/testsuite/webmvc/pom.xml b/integration/spring-data/testsuite/webmvc/pom.xml
index 7a0eea8d7a..65ae7f308f 100644
--- a/integration/spring-data/testsuite/webmvc/pom.xml
+++ b/integration/spring-data/testsuite/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -15,8 +15,12 @@
         <module.name>com.blazebit.persistence.integration.spring.data.testsuite.webmvc</module.name>
         <spring.activeProfiles />
         <test.argLine />
-        <main.java.version>1.8</main.java.version>
-        <version.spring>${version.spring-data-2.7-spring}</version.spring>
+        <main.java.version>17</main.java.version>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
+        <version.hibernate>${version.hibernate-6.2}</version.hibernate>
+        <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62</jpa.excludedGroups>
     </properties>
 
     <dependencyManagement>
@@ -32,6 +36,21 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-common-utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${version.spring-data}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-api</artifactId>
@@ -44,39 +63,87 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-            <scope>compile</scope>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>
-            <scope>compile</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-impl</artifactId>
-            <scope>runtime</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-entity-view-impl</artifactId>
-            <scope>runtime</scope>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>${version.hibernate}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-testing</artifactId>
+            <version>${version.hibernate}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${version.jaxb-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${version.jta-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>${version.activation-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
         <!-- Test Dependencies -->
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${version.servlet}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${version.servlet-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -92,7 +159,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.8</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,3036 +177,119 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jaxb-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-test</id>
-                        <goals>
-                            <goal>process-test</goal>
-                        </goals>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                            <processors>
-                                <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <jdbc.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</jdbc.url>
+                        <jdbc.user>admin</jdbc.user>
+                        <jdbc.password>admin</jdbc.password>
+                        <jdbc.driver>org.h2.Driver</jdbc.driver>
+                        <user.timezone>UTC</user.timezone>
+                        <activeProfiles>hibernate</activeProfiles>
+                    </systemPropertyVariables>
+                    <dependenciesToScan>
+                        <dependency>com.blazebit:blaze-persistence-integration-spring-data-testsuite-webmvc-jakarta</dependency>
+                    </dependenciesToScan>
+                </configuration>
                 <dependencies>
                     <dependency>
-                        <groupId>com.blazebit</groupId>
-                        <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                        <version>${project.version}</version>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>${version.surefire.plugin}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/test-metamodel</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <!-- Metamodel -->
+                        <dependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <processor>com.blazebit.persistence.view.processor.EntityViewAnnotationProcessor</processor>
+                    </annotationProcessors>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- RDBMS profiles -->
-        <profile>
-            <id>h2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                                <jdbc.user>admin</jdbc.user>
-                                <jdbc.password>admin</jdbc.password>
-                                <jdbc.driver>org.h2.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>${h2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mysql8</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
-                                <jdbc.user>root</jdbc.user>
-                                <jdbc.password />
-                                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgresql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:postgresql://${dbHost}:5432/test</jdbc.url>
-                                <jdbc.user>postgres</jdbc.user>
-                                <jdbc.password>postgres</jdbc.password>
-                                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                                <hibernate.default_schema>public</hibernate.default_schema>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sqlite</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlite:test.db</jdbc.url>
-                                <jdbc.user />
-                                <jdbc.password />
-                                <jdbc.driver>org.sqlite.JDBC</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.xerial</groupId>
-                    <artifactId>sqlite-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>db2</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDB2,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:db2://${dbHost}:50000/test</jdbc.url>
-                                <jdbc.user>db2inst1</jdbc.user>
-                                <jdbc.password>db2inst1-pwd</jdbc.password>
-                                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ibm.db2</groupId>
-                    <artifactId>jcc</artifactId>
-                    <version>11.5.5.0</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>firebird</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:firebirdsql:${dbHost}:/tmp/test.fdb</jdbc.url>
-                                <jdbc.user>SYSDBA</jdbc.user>
-                                <jdbc.password>masterkey</jdbc.password>
-                                <jdbc.driver>org.firebirdsql.jdbc.FBDriver</jdbc.driver>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.firebirdsql.jdbc</groupId>
-                    <artifactId>jaybird-jdk16</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>oracle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
-                                <jdbc.user>SYSTEM</jdbc.user>
-                                <jdbc.password>Oracle18</jdbc.password>
-                                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                                <!-- Careful, we need this otherwise the ordering will be wrong... -->
-                                <user.country>US</user.country>
-                                <user.language>en</user.language>
-                                <!-- Dumb, dumber, Oracle -->
-                                <!-- See https://stackoverflow.com/questions/33232260/temporaltemporaltype-date-with-oracle-12 -->
-                                <oracle.jdbc.DateZeroTime>true</oracle.jdbc.DateZeroTime>
-                                <activeProfiles>${spring.activeProfiles}</activeProfiles>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ojdbc8</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>mssql</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL,${jpa.excludedGroups}</excludedGroups>
-                            <systemPropertyVariables>
-                                <jdbc.url>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</jdbc.url>
-                                <jdbc.user>sa</jdbc.user>
-                                <jdbc.password>Blaze-Persistence</jdbc.password>
-                                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>${version.surefire.plugin}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>recreate-schema</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${skipTests}</skip>
-                                    <mainClass>com.blazebit.persistence.testsuite.base.jpa.SchemaClearer</mainClass>
-                                    <systemProperties>
-                                        <systemProperty>
-                                            <key>jdbc.url</key>
-                                            <value>jdbc:sqlserver://${dbHost}:1433;trustServerCertificate=true</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.user</key>
-                                            <value>sa</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.password</key>
-                                            <value>Blaze-Persistence</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>jdbc.driver</key>
-                                            <value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
-                                        </systemProperty>
-                                    </systemProperties>
-                                    <includePluginDependencies>true</includePluginDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-entitymanager</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.microsoft.sqlserver</groupId>
-                                <artifactId>mssql-jdbc</artifactId>
-                                <version>${mssql.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.microsoft.sqlserver</groupId>
-                    <artifactId>mssql-jdbc</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- JPA provider profiles -->
-        <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
-            <id>hibernate-5.1</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.2</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.3</id>
+            <id>hibernate-6.6</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.4</id>
+            <id>spring-data-3.1.x</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.1-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.5</id>
+            <id>spring-data-3.2.x</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.2-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
-            <id>hibernate-5.6</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
+            <id>spring-data-3.3.x</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipselink</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink</jpa.excludedGroups>
-                <spring.activeProfiles>eclipselink</spring.activeProfiles>
-                <surefire.jvm.params>-Xms1024m -Xmx2048m -javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</surefire.jvm.params>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>eclipselink</artifactId>
-                    <version>${version.eclipselink}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                    <version>${version.eclipselink}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-agent</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.springframework</groupId>
-                                            <artifactId>spring-instrument</artifactId>
-                                            <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                            <destFileName>spring-instrumentation-agent.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Only need this for IntelliJ -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-javaagent:${project.build.directory}/agents/spring-instrumentation-agent.jar</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jta}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-                <spring.activeProfiles>openjpa</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-                <spring.activeProfiles>hibernate</spring.activeProfiles>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                    <version>${project.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-entity-view-processor</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/generated-sources/metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-1.x}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.1.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.1 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-3.2.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.2 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-3.3.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-jpa</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
 </project>
diff --git a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Document.java b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Document.java
index 32ab322e3b..4814d59d7a 100644
--- a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Document.java
+++ b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Document.java
@@ -5,15 +5,15 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webmvc.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
 import java.io.Serializable;
 
 /**
diff --git a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/IdClassEntity.java b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/IdClassEntity.java
index fc8fbe7832..acc3acfbe3 100644
--- a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/IdClassEntity.java
+++ b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/IdClassEntity.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webmvc.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Person.java b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Person.java
index 7b9c174dc6..6410aef6db 100644
--- a/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Person.java
+++ b/integration/spring-data/testsuite/webmvc/src/main/java/com/blazebit/persistence/spring/data/testsuite/webmvc/entity/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webmvc.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/spring-data/testsuite/webmvc/src/main/resources/META-INF/persistence.xml b/integration/spring-data/testsuite/webmvc/src/main/resources/META-INF/persistence.xml
index 13e8a63695..6c39b65178 100644
--- a/integration/spring-data/testsuite/webmvc/src/main/resources/META-INF/persistence.xml
+++ b/integration/spring-data/testsuite/webmvc/src/main/resources/META-INF/persistence.xml
@@ -11,7 +11,7 @@
         <class>com.blazebit.persistence.spring.data.testsuite.webmvc.entity.IdClassEntity</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/DocumentProjectionEntityViewRepositoryTest.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/DocumentProjectionEntityViewRepositoryTest.java
index 5f3671d4e6..c9c14bdb51 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/DocumentProjectionEntityViewRepositoryTest.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/DocumentProjectionEntityViewRepositoryTest.java
@@ -23,7 +23,7 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/GenericRepositoryTest.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/GenericRepositoryTest.java
index 4cdd0d5e89..0176fb1a02 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/GenericRepositoryTest.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/GenericRepositoryTest.java
@@ -25,7 +25,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java
index 1db3f629d7..5e047c8bea 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java
@@ -5,6 +5,20 @@
 
 package com.blazebit.persistence.spring.data.testsuite.webmvc;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
 import com.blazebit.persistence.spring.data.repository.BlazeSpecification;
 import com.blazebit.persistence.spring.data.repository.EntityViewSettingProcessor;
@@ -24,25 +38,18 @@
 import com.blazebit.persistence.spring.data.testsuite.webmvc.tx.TxWork;
 import com.blazebit.persistence.spring.data.testsuite.webmvc.view.DocumentView;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
 import com.blazebit.persistence.view.Sorters;
-
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.annotation.ComponentScan;
@@ -56,17 +63,6 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -106,9 +102,8 @@ public void initRepository() {
     }
 
     // NOTE: EclipseLink and DataNucleus seem to have a problem with the way Spring Data makes use of entity graphs, although it just uses the JPA APIs
-    // Hibernate 4.2 doesn't support the JPA 2.1 APIs that introduced entity graphs
     @Test
-    @Category({ NoHibernate42.class, NoEclipselink.class, NoDatanucleus.class })
+    @Category({ NoEclipselink.class})
     public void testFindD1EntityGraph() {
         // Given
         final Document d1 = createDocument("D1");
@@ -137,8 +132,7 @@ public void testFindD1NamedQuery() {
     @Test
     // We don't want to deal with the different casing requirements for table names in the various DBs so we only run
     // this test for H2.
-    // DataNucleus is not able to create entities from native query result sets.
-    @Category({NoDatanucleus.class, NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoSQLite.class, NoFirebird.class, NoDB2.class})
+    @Category({ NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoDB2.class})
     public void testFindD1Native() {
         // Given
         final Document d1 = createDocument("D1");
@@ -180,7 +174,7 @@ public void testFindD1NamedQueryProjection() {
     @Test
     // We don't want to deal with the different casing requirements for table names in the various DBs so we only run
     // this test for H2.
-    @Category({NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoSQLite.class, NoFirebird.class, NoDB2.class})
+    @Category({NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoDB2.class})
     public void testFindD1NativeProjection() {
         // Given
         final Document d1 = createDocument("D1");
@@ -856,9 +850,7 @@ public Predicate toPredicate(Root<Document> root, CriteriaQuery<?> query, Criter
     }
 
     // Test for #1817
-    // No idea what's wrong with Datanucleus
     @Test
-    @Category({ NoDatanucleus.class })
     public void testFindByEnum() {
         // Given
         final Document d1 = createDocument("D1", "test", 0, null);
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/BlazePersistenceConfiguration.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/BlazePersistenceConfiguration.java
index daa26cfd84..7dc30d1a70 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/BlazePersistenceConfiguration.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/BlazePersistenceConfiguration.java
@@ -17,8 +17,8 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
index 820b6723b9..820db8bef2 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
@@ -7,8 +7,8 @@
 
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
 import java.util.Properties;
 
 /**
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/DocumentRepository.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/DocumentRepository.java
index 89b5cd14e1..c258c0365f 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/DocumentRepository.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/DocumentRepository.java
@@ -8,7 +8,7 @@
 import com.blazebit.persistence.spring.data.testsuite.webmvc.view.DocumentCreateOrUpdateView;
 import com.blazebit.persistence.spring.data.testsuite.webmvc.view.DocumentUpdateView;
 import com.blazebit.persistence.view.EntityViewManager;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/PersonRepositoryImpl.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/PersonRepositoryImpl.java
index 89e6be7675..4a471d8f4c 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/PersonRepositoryImpl.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/repository/PersonRepositoryImpl.java
@@ -10,7 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TransactionalWorkService.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TransactionalWorkService.java
index 790d7d4a79..6fdcb15225 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TransactionalWorkService.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TransactionalWorkService.java
@@ -10,7 +10,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxVoidWork.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxVoidWork.java
index 1bf9b310b0..334b660065 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxVoidWork.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxVoidWork.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxWork.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxWork.java
index c4fb369ea2..02894681da 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxWork.java
+++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/tx/TxWork.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
diff --git a/integration/spring-data/testsuite/webmvc/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webmvc/application-config.xml b/integration/spring-data/testsuite/webmvc/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webmvc/application-config.xml
index 9417be55dc..15f88a247d 100644
--- a/integration/spring-data/testsuite/webmvc/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webmvc/application-config.xml
+++ b/integration/spring-data/testsuite/webmvc/src/test/resources/com/blazebit/persistence/spring/data/testsuite/webmvc/application-config.xml
@@ -26,10 +26,10 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
                     <prop key="hibernate.show_sql">false</prop>
 
                     <!-- required for Hibernate 4.2 -->
@@ -54,11 +54,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             </property>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                     <prop key="eclipselink.logging.level">OFF</prop> <!-- use FINE for debugging -->
                 </props>
             </property>
@@ -71,11 +71,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
@@ -89,11 +89,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
diff --git a/integration/spring-data/webflux/pom.xml b/integration/spring-data/webflux/pom.xml
index 425c5fee29..bb6dcd6e3f 100644
--- a/integration/spring-data/webflux/pom.xml
+++ b/integration/spring-data/webflux/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,12 +13,11 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.spring.data.webflux</module.name>
-        <main.java.version>1.8</main.java.version>
         <spring.activeProfiles />
         <test.argLine />
 
-        <version.spring>${version.spring-data-2.0-spring}</version.spring>
-        <version.spring-data>${version.spring-data-2.0}</version.spring-data>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
     </properties>
 
     <dependencyManagement>
@@ -34,6 +33,31 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -51,10 +75,15 @@
             <version>${version.spring-data}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${version.spring-data}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -76,247 +105,52 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.webflux;
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        requires com.blazebit.persistence.integration.jackson;
-                                        exports com.blazebit.persistence.spring.data.webflux;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <!--
-            Even though spring-data-1.11.x is not supported for webflux, we need this profile so that everything compiles
-            in IDEA.
-            -->
-            <id>spring-data-1.11.x</id>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.0}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.1}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.2}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.3}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.4}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.5}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.6}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.7}</version.spring-data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>spring-data-3.1.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.7}</version.spring-data>
+                <version.spring>${version.spring-data-3.1-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.1 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>spring-data-3.2.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.7}</version.spring-data>
+                <version.spring>${version.spring-data-3.2-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.2 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>spring-data-3.3.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring-data>${version.spring-data-2.7}</version.spring-data>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
 
diff --git a/integration/spring-data/webflux/src/main/java/module-info.java b/integration/spring-data/webflux/src/main/java/module-info.java
new file mode 100644
index 0000000000..83974c6486
--- /dev/null
+++ b/integration/spring-data/webflux/src/main/java/module-info.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data.webflux {
+	requires transitive spring.webflux;
+	requires transitive com.blazebit.persistence.integration.spring.data;
+	requires com.blazebit.persistence.integration.jackson;
+	requires com.fasterxml.jackson.databind;
+	requires spring.beans;
+	requires spring.core;
+	requires spring.web;
+	requires spring.data.commons;
+	requires reactor.core;
+	requires com.blazebit.common.utils;
+	requires com.fasterxml.jackson.core;
+	requires org.reactivestreams;
+	requires spring.jcl;
+	requires org.slf4j;
+	exports com.blazebit.persistence.spring.data.webflux;
+}
\ No newline at end of file
diff --git a/integration/spring-data/webmvc-jakarta/pom.xml b/integration/spring-data/webmvc-jakarta/pom.xml
deleted file mode 100644
index e9619e6715..0000000000
--- a/integration/spring-data/webmvc-jakarta/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-Data-WebMvc Jakarta</name>
-    <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.data.webmvc</module.name>
-        <version.spring>${version.spring-data-3.1-spring}</version.spring>
-        <test.argLine />
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${version.jakarta-servlet}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>${version.spring-data-3.1}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-        </dependency>
-
-        <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jaxb-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.activation}</version>
-        </dependency>
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.webmvc;
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        requires com.blazebit.persistence.integration.jackson;
-                                        exports com.blazebit.persistence.spring.data.webmvc;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java
deleted file mode 100644
index b95c690ab4..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc;
-
-import org.springframework.core.annotation.AliasFor;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Binds the value of a URI template variable or a path segment
- * containing the template parameter to the entity view id of the
- * entity view typed parameter that this annotation is placed on.
- * <p>
- * The type of the annotated parameter must be an entity view type.
- *
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Target({ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EntityViewId {
-    /**
-     * Alias for {@link #name}.
-     *
-     * @return The name of the path variable to bind to.
-     */
-    @AliasFor("name")
-    String value() default "";
-
-    /**
-     * The name of the path variable to bind to.
-     *
-     * @return The name of the path variable to bind to.
-     */
-    @AliasFor("value")
-    String name() default "";
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java
deleted file mode 100644
index d3eb8a78c8..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc;
-
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Required configuration for a {@link KeysetPageable} that specifies the keyset element type.
- *
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface KeysetConfig {
-
-    /**
-     * The keyset element type. Usually the entity type or the DTO type representing the result element type.
-     *
-     * @return The keyset element type.
-     */
-    Class<?> value() default void.class;
-
-    /**
-     * Alias for {@link #value()}.
-     *
-     * @return The keyset element type
-     */
-    Class<?> keysetClass() default void.class;
-
-    /**
-     * The query parameter name for the previous offset parameter.
-     *
-     * @return The previous offset query parameter name
-     * @since 1.3.0
-     */
-    String previousOffsetName() default "";
-
-    /**
-     * The query parameter name for the previous page parameter.
-     *
-     * @return The previous page query parameter name
-     */
-    String previousPageName() default "";
-
-    /**
-     * The query parameter name for the previous page size parameter.
-     *
-     * @return The previous page size query parameter name
-     */
-    String previousPageSizeName() default "";
-
-    /**
-     * The query parameter name for the lowest keyset parameter.
-     *
-     * @return The lowest keyset query parameter name
-     */
-    String lowestName() default "";
-
-    /**
-     * The query parameter name for the highest keyset parameter.
-     *
-     * @return The highest keyset query parameter name
-     */
-    String highestName() default "";
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java
deleted file mode 100644
index 5b7fe79424..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc;
-
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.spring.data.webmvc.impl.KeysetPageableHandlerMethodArgumentResolver;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableArgumentResolver;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.web.context.request.NativeWebRequest;
-
-/**
- * Argument resolver to extract a {@link KeysetPageable} object from a {@link NativeWebRequest} for a particular
- * {@link org.springframework.core.MethodParameter}. {@link KeysetPageable} resolution yields either
- * in a {@link Pageable} object or {@literal null} if {@link KeysetPageable} cannot be resolved.
- *
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public interface KeysetPageableArgumentResolver extends PageableArgumentResolver {
-    /**
-     * Configures the {@link Pageable} to be used as fallback in case no {@link PageableDefault} or
-     * {@link PageableDefault} (the latter only supported in legacy mode) can be found at the method parameter to be
-     * resolved.
-     * <p>
-     * If you set this to {@literal Optional#empty()}, be aware that you controller methods will get {@literal null}
-     * handed into them in case no {@link Pageable} data can be found in the request. Note, that doing so will require you
-     * supply bot the page <em>and</em> the size parameter with the requests as there will be no default for any of the
-     * parameters available.
-     *
-     * @param fallbackPageable the {@link Pageable} to be used as general fallback.
-     */
-    void setFallbackPageable(Pageable fallbackPageable);
-
-    /**
-     * @param fallbackPageable the {@link KeysetPageable} to be used as general fallback.
-     * @see KeysetPageableArgumentResolver#setFallbackPageable(Pageable)
-     */
-    void setFallbackPageable(KeysetPageable fallbackPageable);
-
-    /**
-     * Configures the maximum page size to be accepted. This allows to put an upper boundary of the page size to prevent
-     * potential attacks trying to issue an {@link OutOfMemoryError}. Defaults to {@link org.springframework.data.web.PageableHandlerMethodArgumentResolver#DEFAULT_MAX_PAGE_SIZE}.
-     *
-     * @param maxPageSize the maxPageSize to set
-     */
-    void setMaxPageSize(int maxPageSize);
-
-    /**
-     * Configures the parameter name to be used to find the page number in the request. Defaults to {@code page}.
-     *
-     * @param pageParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setPageParameterName(String pageParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the page size in the request. Defaults to {@code size}.
-     *
-     * @param sizeParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setSizeParameterName(String sizeParameterName);
-
-    /**
-     * Configures a general prefix to be prepended to the page number and page size parameters. Useful to namespace the
-     * property names used in case they are clashing with ones used by your application. By default, no prefix is used.
-     *
-     * @param prefix the prefix to be used or {@literal null} to reset to the default.
-     */
-    void setPrefix(String prefix);
-
-    /**
-     * The delimiter to be used between the qualifier and the actual page number and size properties. Defaults to
-     * {@code _}. So a qualifier of {@code foo} will result in a page number parameter of {@code foo_page}.
-     *
-     * @param qualifierDelimiter the delimiter to be used or {@literal null} to reset to the default.
-     */
-    void setQualifierDelimiter(String qualifierDelimiter);
-
-    /**
-     * Configures whether to expose and assume 1-based page number indexes in the request parameters. Defaults to
-     * {@literal false}, meaning a page number of 0 in the request equals the first page. If this is set to
-     * {@literal true}, a page number of 1 in the request will be considered the first page.
-     *
-     * @param oneIndexedParameters the oneIndexedParameters to set
-     */
-    void setOneIndexedParameters(boolean oneIndexedParameters);
-
-    /**
-     * Configures the parameter name to be used to find the offset in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_OFFSET_PARAMETER}.
-     *
-     * @param offsetParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setOffsetParameterName(String offsetParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the previous offset in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_PREVIOUS_OFFSET_PARAMETER}.
-     *
-     * @param previousOffsetParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setPreviousOffsetParameterName(String previousOffsetParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the previous page in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_PREVIOUS_PAGE_PARAMETER}.
-     *
-     * @param previousPageParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setPreviousPageParameterName(String previousPageParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the previous size in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_PREVIOUS_SIZE_PARAMETER}.
-     *
-     * @param previousSizeParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setPreviousSizeParameterName(String previousSizeParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the lowest keyset in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_LOWEST_PARAMETER}.
-     *
-     * @param lowestParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setLowestParameterName(String lowestParameterName);
-
-    /**
-     * Configures the parameter name to be used to find the highest keyset in the request. Defaults to {@link KeysetPageableHandlerMethodArgumentResolver#DEFAULT_HIGHEST_PARAMETER}.
-     *
-     * @param highestParameterName the parameter name to be used, must not be {@literal null} or empty.
-     */
-    void setHighestParameterName(String highestParameterName);
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java
deleted file mode 100644
index 4a93853824..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl;
-
-import com.blazebit.persistence.integration.jackson.EntityViewIdValueAccessor;
-import com.blazebit.persistence.spring.data.webmvc.KeysetPageableArgumentResolver;
-import com.blazebit.persistence.spring.data.webmvc.impl.json.EntityViewAwareMappingJackson2HttpMessageConverter;
-import com.blazebit.persistence.spring.data.webmvc.impl.json.EntityViewIdHandlerInterceptor;
-import com.blazebit.persistence.spring.data.webmvc.impl.json.EntityViewIdValueHolder;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.web.SortHandlerMethodArgumentResolver;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Configuration
-public class BlazePersistenceWebConfiguration implements WebMvcConfigurer {
-
-    protected final ObjectFactory<ConversionService> conversionService;
-    protected final ObjectMapper objectMapper;
-    private final EntityViewManager entityViewManager;
-
-    public BlazePersistenceWebConfiguration(EntityViewManager entityViewManager,
-            @Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService,
-            @Autowired(required = false) ObjectMapper objectMapper) {
-        this.entityViewManager = entityViewManager;
-        this.conversionService = conversionService;
-        this.objectMapper = objectMapper == null ? new ObjectMapper() : objectMapper.copy();
-    }
-
-    protected ObjectMapper objectMapper() {
-        return objectMapper;
-    }
-
-    @Bean
-    public KeysetPageableArgumentResolver blazeWebmvcKeysetPageableResolver() {
-        return new KeysetPageableHandlerMethodArgumentResolver(blazeWebmvcKeysetSortResolver(), conversionService.getObject(), objectMapper());
-    }
-
-    @Bean
-    public SortHandlerMethodArgumentResolver blazeWebmvcKeysetSortResolver() {
-        return new SortHandlerMethodArgumentResolver();
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        for (int i = 0; i < argumentResolvers.size(); i++) {
-            if (argumentResolvers.get(i) instanceof KeysetPageableArgumentResolver) {
-                return;
-            }
-        }
-
-        // Add it to the beginning so it has precedence over the builtin
-        argumentResolvers.add(0, blazeWebmvcKeysetPageableResolver());
-    }
-
-    @Override
-    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-        // Add it to the beginning, so it has precedence over the builtin
-        converters.add(0, new EntityViewAwareMappingJackson2HttpMessageConverter(entityViewManager, blazeWebmvcIdAttributeAccessor(), objectMapper()));
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new EntityViewIdHandlerInterceptor(entityViewManager, (EntityViewIdValueHolder) blazeWebmvcIdAttributeAccessor()));
-    }
-
-    @Bean
-    public EntityViewIdValueAccessor blazeWebmvcIdAttributeAccessor() {
-        return new EntityViewIdValueHolder(conversionService.getObject());
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java
deleted file mode 100644
index 4b09a40932..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl;
-
-import com.blazebit.persistence.DefaultKeyset;
-import com.blazebit.persistence.DefaultKeysetPage;
-import com.blazebit.persistence.KeysetPage;
-import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.spring.data.webmvc.KeysetConfig;
-import com.blazebit.persistence.spring.data.webmvc.KeysetPageableArgumentResolver;
-import com.blazebit.reflection.ReflectionUtils;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
-import org.springframework.data.web.SortHandlerMethodArgumentResolver;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.method.support.ModelAndViewContainer;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- *
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class KeysetPageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolver implements KeysetPageableArgumentResolver {
-
-    private static final String DEFAULT_OFFSET_PARAMETER = "offset";
-    private static final String DEFAULT_PREVIOUS_OFFSET_PARAMETER = "prevOffset";
-    private static final String DEFAULT_PREVIOUS_PAGE_PARAMETER = "prevPage";
-    private static final String DEFAULT_PREVIOUS_SIZE_PARAMETER = "prevSize";
-    private static final String DEFAULT_LOWEST_PARAMETER = "lowest";
-    private static final String DEFAULT_HIGHEST_PARAMETER = "highest";
-    private static final String INVALID_DEFAULT_PAGE_SIZE = "Invalid default page size configured for method %s! Must not be less than one!";
-    private static final String INVALID_KEYSET_DOMAIN_CLASS = "Invalid keyset domain class configured for method %s! Should be an entity type!";
-    private static final KeysetPageable DEFAULT_PAGE_REQUEST;
-    private static final org.springframework.data.domain.Sort UNSORTED;
-    private final ConcurrentMap<PropertyCacheKey, Class<? extends Serializable>> propertyTypeCache = new ConcurrentHashMap<>();
-    private final ObjectMapper mapper;
-    private final SortHandlerMethodArgumentResolver sortResolver;
-    private final ConversionService conversionService;
-    private KeysetPageable fallbackPageable = DEFAULT_PAGE_REQUEST;
-    private String offsetParameterName = DEFAULT_OFFSET_PARAMETER;
-    private String previousOffsetParameterName = DEFAULT_PREVIOUS_OFFSET_PARAMETER;
-    private String previousPageParameterName = DEFAULT_PREVIOUS_PAGE_PARAMETER;
-    private String previousSizeParameterName = DEFAULT_PREVIOUS_SIZE_PARAMETER;
-    private String lowestParameterName = DEFAULT_LOWEST_PARAMETER;
-    private String highestParameterName = DEFAULT_HIGHEST_PARAMETER;
-
-    static {
-        org.springframework.data.domain.Sort unsorted = null;
-        try {
-            for (Method unsortedCandidate : org.springframework.data.domain.Sort.class.getDeclaredMethods()) {
-                if ("unsorted".equals(unsortedCandidate.getName())) {
-                    unsorted = (org.springframework.data.domain.Sort) unsortedCandidate.invoke(null);
-                    break;
-                }
-            }
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-        UNSORTED = unsorted;
-        DEFAULT_PAGE_REQUEST = new KeysetPageRequest(null, UNSORTED, 0, 20);
-    }
-
-    public KeysetPageableHandlerMethodArgumentResolver() {
-        this(null);
-    }
-
-    public KeysetPageableHandlerMethodArgumentResolver(ConversionService conversionService) {
-        this(null, conversionService, null);
-    }
-
-    public KeysetPageableHandlerMethodArgumentResolver(SortHandlerMethodArgumentResolver sortResolver, ConversionService conversionService, ObjectMapper objectMapper) {
-        super(sortResolver = sortResolver == null ? new SortHandlerMethodArgumentResolver() : sortResolver);
-        this.sortResolver = sortResolver;
-        this.conversionService = conversionService;
-        this.mapper = objectMapper == null ? new ObjectMapper() : objectMapper;
-    }
-
-    /**
-     * @author Christian Beikov
-     * @since 1.2.0
-     */
-    private static class PropertyCacheKey {
-        private final Class<?> clazz;
-        private final String property;
-
-        public PropertyCacheKey(Class<?> clazz, String property) {
-            this.clazz = clazz;
-            this.property = property;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof PropertyCacheKey)) {
-                return false;
-            }
-
-            PropertyCacheKey that = (PropertyCacheKey) o;
-
-            if (!clazz.equals(that.clazz)) {
-                return false;
-            }
-            return property.equals(that.property);
-        }
-
-        @Override
-        public int hashCode() {
-            int result = clazz.hashCode();
-            result = 31 * result + property.hashCode();
-            return result;
-        }
-    }
-
-    @Override
-    public void setFallbackPageable(Pageable fallbackPageable) {
-        setFallbackPageable((KeysetPageable) fallbackPageable);
-    }
-
-    @Override
-    public void setFallbackPageable(KeysetPageable fallbackPageable) {
-        this.fallbackPageable = fallbackPageable;
-    }
-
-    @Override
-    public boolean isFallbackPageable(Pageable pageable) {
-        return fallbackPageable == null ? false : fallbackPageable.equals(pageable);
-    }
-
-    protected String getOffsetParameterName() {
-        return offsetParameterName;
-    }
-
-    @Override
-    public void setOffsetParameterName(String offsetParameterName) {
-        this.offsetParameterName = offsetParameterName;
-    }
-
-    protected String getPreviousOffsetParameterName() {
-        return previousOffsetParameterName;
-    }
-
-    @Override
-    public void setPreviousOffsetParameterName(String previousOffsetParameterName) {
-        this.previousOffsetParameterName = previousOffsetParameterName;
-    }
-
-    protected String getPreviousPageParameterName() {
-        return previousPageParameterName;
-    }
-
-    @Override
-    public void setPreviousPageParameterName(String previousPageParameterName) {
-        this.previousPageParameterName = previousPageParameterName;
-    }
-
-    protected String getPreviousSizeParameterName() {
-        return previousSizeParameterName;
-    }
-
-    @Override
-    public void setPreviousSizeParameterName(String previousSizeParameterName) {
-        this.previousSizeParameterName = previousSizeParameterName;
-    }
-
-    protected String getLowestParameterName() {
-        return lowestParameterName;
-    }
-
-    @Override
-    public void setLowestParameterName(String lowestParameterName) {
-        this.lowestParameterName = lowestParameterName;
-    }
-
-    protected String getHighestParameterName() {
-        return highestParameterName;
-    }
-
-    @Override
-    public void setHighestParameterName(String highestParameterName) {
-        this.highestParameterName = highestParameterName;
-    }
-
-    @Override
-    public boolean supportsParameter(MethodParameter parameter) {
-        return KeysetPageable.class.equals(parameter.getParameterType());
-    }
-
-    protected SortHandlerMethodArgumentResolver getSortResolver() {
-        return sortResolver;
-    }
-
-    @Override
-    public KeysetPageable resolveArgument(MethodParameter methodParameter, ModelAndViewContainer mavContainer,
-                                    NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
-        assertPageableUniqueness(methodParameter);
-
-        Pageable defaultOrFallback = getDefaultFromAnnotationOrFallback(methodParameter);
-
-        String pageString = webRequest.getParameter(getParameterNameToUse(getPageParameterName(), methodParameter));
-        String offsetString = webRequest.getParameter(getParameterNameToUse(getOffsetParameterName(), methodParameter));
-        String pageSizeString = webRequest.getParameter(getParameterNameToUse(getSizeParameterName(), methodParameter));
-
-        boolean pageAndSizeGiven = (StringUtils.hasText(pageString) || StringUtils.hasText(offsetString)) && StringUtils.hasText(pageSizeString);
-
-        if (!pageAndSizeGiven && defaultOrFallback == null) {
-            return null;
-        }
-
-        int pageSize = StringUtils.hasText(pageSizeString) ? parseAndApplyBoundaries(pageSizeString, getMaxPageSize(), false)
-                : defaultOrFallback.getPageSize();
-
-        // Limit lower bound
-        pageSize = pageSize < 1 ? defaultOrFallback.getPageSize() : pageSize;
-        // Limit upper bound
-        pageSize = pageSize > getMaxPageSize() ? getMaxPageSize() : pageSize;
-
-        int offset;
-        if (StringUtils.hasText(offsetString)) {
-            offset = parseAndApplyBoundaries(offsetString, Integer.MAX_VALUE, false);
-        } else if (StringUtils.hasText(pageString)) {
-            offset = pageSize * parseAndApplyBoundaries(pageString, Integer.MAX_VALUE, true);
-        } else {
-            offset = pageSize * defaultOrFallback.getPageNumber();
-        }
-
-        org.springframework.data.domain.Sort sort = sortResolver.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
-
-        // Default if necessary and default configured
-        sort = sort == UNSORTED && defaultOrFallback != null ? defaultOrFallback.getSort() : sort;
-
-        KeysetPage keysetPage = null;
-        Iterator<org.springframework.data.domain.Sort.Order> iterator;
-        if (sort != null && (iterator = sort.iterator()).hasNext()) {
-            KeysetConfig keysetConfig = methodParameter.getParameterAnnotation(KeysetConfig.class);
-            Class<?> domainClass = keysetConfig.keysetClass();
-            if (domainClass == void.class) {
-                domainClass = keysetConfig.value();
-            }
-
-            if (domainClass == void.class) {
-                Method annotatedMethod = methodParameter.getMethod();
-                throw new IllegalStateException(String.format(INVALID_KEYSET_DOMAIN_CLASS, annotatedMethod));
-            }
-            String previousOffsetName = getParameterName(keysetConfig.previousOffsetName(), getParameterNameToUse(getPreviousOffsetParameterName(), methodParameter));
-            String previousOffsetString = webRequest.getParameter(previousOffsetName);
-
-            String previousPageName = getParameterName(keysetConfig.previousPageName(), getParameterNameToUse(getPreviousPageParameterName(), methodParameter));
-            String previousPageString = webRequest.getParameter(previousPageName);
-
-            if (StringUtils.hasText(previousOffsetString) || StringUtils.hasText(previousPageString)) {
-                String previousPageSizeName = getParameterName(keysetConfig.previousPageSizeName(), getParameterNameToUse(getPreviousSizeParameterName(), methodParameter));
-                String previousPageSizeString = webRequest.getParameter(previousPageSizeName);
-                int previousPageSize = StringUtils.hasText(previousPageSizeString) ? parseAndApplyBoundaries(previousPageSizeString, getMaxPageSize(), false)
-                        : pageSize;
-
-                int previousOffset;
-                if (StringUtils.hasText(previousOffsetString)) {
-                    previousOffset = parseAndApplyBoundaries(previousOffsetString, Integer.MAX_VALUE, false);
-                } else {
-                    int previousPage = parseAndApplyBoundaries(previousPageString, Integer.MAX_VALUE, true);
-                    previousOffset = previousPage * previousPageSize;
-                }
-
-                String lowestName = getParameterName(keysetConfig.lowestName(), getParameterNameToUse(getLowestParameterName(), methodParameter));
-                String lowestString = webRequest.getParameter(lowestName);
-                String highestName = getParameterName(keysetConfig.highestName(), getParameterNameToUse(getHighestParameterName(), methodParameter));
-                String highestString = webRequest.getParameter(highestName);
-                if (StringUtils.hasText(lowestString) && StringUtils.hasText(highestString)) {
-                    List<Serializable> lowest = new ArrayList<>();
-                    List<Serializable> highest = new ArrayList<>();
-                    JsonNode lowestObject;
-                    JsonNode highestObject;
-                    try {
-                        lowestObject = mapper.readTree(lowestString);
-                    } catch (IOException ex) {
-                        throw new IllegalArgumentException("Invalid lowest object!", ex);
-                    }
-                    try {
-                        highestObject = mapper.readTree(highestString);
-                    } catch (IOException ex) {
-                        throw new IllegalArgumentException("Invalid highest object!", ex);
-                    }
-
-                    while (iterator.hasNext()) {
-                        org.springframework.data.domain.Sort.Order o = iterator.next();
-                        JsonNode low = lowestObject;
-                        JsonNode high = highestObject;
-                        String[] propertyParts = o.getProperty().split("\\.");
-                        Class<? extends Serializable> propertyType = getPropertyType(domainClass, o.getProperty());
-
-                        for (int i = 0; i < propertyParts.length; i++) {
-                            low = low == null ? null : low.get(propertyParts[i]);
-                            high = high == null ? null : high.get(propertyParts[i]);
-                        }
-
-                        lowest.add(low == null ? null : convert(low, propertyType));
-                        highest.add(high == null ? null : convert(high, propertyType));
-                    }
-                    keysetPage = new DefaultKeysetPage(
-                            previousOffset,
-                            previousPageSize,
-                            new DefaultKeyset(lowest.toArray(new Serializable[lowest.size()])),
-                            new DefaultKeyset(highest.toArray(new Serializable[highest.size()]))
-                    );
-                }
-            }
-        }
-        return new KeysetPageRequest(keysetPage, sort, offset, pageSize);
-    }
-
-    private static String getParameterName(String name, String defaultName) {
-        if (name == null || name.isEmpty()) {
-            return defaultName;
-        }
-        return name;
-    }
-
-    private Serializable convert(JsonNode valueNode, Class<? extends Serializable> propertyType) {
-        switch (valueNode.getNodeType()) {
-            case NULL:
-                return null;
-            case BOOLEAN:
-                if (propertyType == Boolean.class || propertyType == boolean.class) {
-                    return valueNode.asBoolean();
-                } else {
-                    return conversionService.convert(valueNode.asBoolean(), propertyType);
-                }
-            case NUMBER:
-                Number number = valueNode.numberValue();
-                if (propertyType == Integer.class || propertyType == int.class) {
-                    return number.intValue();
-                } else if (propertyType == Long.class || propertyType == long.class) {
-                    return number.longValue();
-                } else if (propertyType == Double.class || propertyType == double.class) {
-                    return number.doubleValue();
-                } else if (propertyType == Float.class || propertyType == float.class) {
-                    return number.floatValue();
-                } else if (propertyType == Byte.class || propertyType == byte.class) {
-                    return number.byteValue();
-                } else if (propertyType == Short.class || propertyType == short.class) {
-                    return number.shortValue();
-                } else if (propertyType == BigInteger.class) {
-                    return valueNode.bigIntegerValue();
-                } else if (propertyType == BigDecimal.class) {
-                    return valueNode.decimalValue();
-                } else if (conversionService.canConvert(number.getClass(), propertyType)) {
-                    return conversionService.convert(number, propertyType);
-                } else {
-                    return conversionService.convert(valueNode.asText(), propertyType);
-                }
-            case STRING:
-                if (propertyType == String.class) {
-                    return valueNode.asText();
-                } else {
-                    return conversionService.convert(valueNode.asText(), propertyType);
-                }
-            default:
-                throw new IllegalArgumentException("Can't convert value of type '" + valueNode.getNodeType() + "' to '" + propertyType.getName() + "'");
-        }
-    }
-
-    private Class<? extends Serializable> getPropertyType(Class<?> clazz, String property) {
-        PropertyCacheKey cacheKey = new PropertyCacheKey(clazz, property);
-        Class<? extends Serializable> propertyType = propertyTypeCache.get(cacheKey);
-        if (propertyType == null) {
-            propertyType = resolvePropertyType(clazz, property);
-            propertyTypeCache.putIfAbsent(cacheKey, propertyType);
-        }
-        return propertyType;
-    }
-
-    private Class<? extends Serializable> resolvePropertyType(Class<?> baseClazz, String property) {
-        Class<?> clazz = baseClazz;
-        String[] propertyParts = property.split("\\.");
-        for (int i = 0; i < propertyParts.length; i++) {
-            Method getter = ReflectionUtils.getGetter(clazz, propertyParts[i]);
-            if (getter == null) {
-                Field field = ReflectionUtils.getField(clazz, propertyParts[i]);
-                if (field == null) {
-                    throw new IllegalArgumentException("Couldn't find property '" + propertyParts[i] + "' on type '" + clazz + "' while resolving path '" + property + "' on type '" + baseClazz + "'");
-                }
-                Class<?>[] typeArguments = ReflectionUtils.getResolvedFieldTypeArguments(clazz, field);
-                if (typeArguments.length == 0) {
-                    clazz = ReflectionUtils.getResolvedFieldType(clazz, field);
-                } else {
-                    clazz = typeArguments[typeArguments.length - 1];
-                }
-            } else {
-                Class<?>[] typeArguments = ReflectionUtils.getResolvedMethodReturnTypeArguments(clazz, getter);
-                if (typeArguments.length == 0) {
-                    clazz = ReflectionUtils.getResolvedMethodReturnType(clazz, getter);
-                } else {
-                    clazz = typeArguments[typeArguments.length - 1];
-                }
-            }
-        }
-
-        return (Class<? extends Serializable>) clazz;
-    }
-
-    private KeysetPageable getDefaultFromAnnotationOrFallback(MethodParameter methodParameter) {
-        if (methodParameter.hasParameterAnnotation(PageableDefault.class)) {
-            return getDefaultPageRequestFrom(methodParameter);
-        }
-
-        return fallbackPageable;
-    }
-
-    private static KeysetPageable getDefaultPageRequestFrom(MethodParameter parameter) {
-        PageableDefault defaults = parameter.getParameterAnnotation(PageableDefault.class);
-
-        Integer defaultPageNumber = defaults.page();
-        Integer defaultPageSize = getSpecificPropertyOrDefaultFromValue(defaults, "size");
-
-        if (defaultPageSize < 1) {
-            Method annotatedMethod = parameter.getMethod();
-            throw new IllegalStateException(String.format(INVALID_DEFAULT_PAGE_SIZE, annotatedMethod));
-        }
-
-        if (defaults.sort().length == 0) {
-            return new KeysetPageRequest(defaultPageNumber, defaultPageSize, null, null);
-        }
-        return new KeysetPageRequest(defaultPageNumber, defaultPageSize, null, Sort.of(defaults.direction(), defaults.sort()));
-    }
-
-    private int parseAndApplyBoundaries(String parameter, int upper, boolean shiftIndex) {
-        try {
-            int parsed = Integer.parseInt(parameter) - (isOneIndexedParameters() && shiftIndex ? 1 : 0);
-            return parsed < 0 ? 0 : parsed > upper ? upper : parsed;
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    /* Copied from org.springframework.data.web.SpringDataAnnotationUtils because the class isn't public... */
-
-    private static <T> T getSpecificPropertyOrDefaultFromValue(Annotation annotation, String property) {
-        Object propertyDefaultValue = AnnotationUtils.getDefaultValue(annotation, property);
-        Object propertyValue = AnnotationUtils.getValue(annotation, property);
-
-        return (T) (ObjectUtils.nullSafeEquals(propertyDefaultValue, propertyValue) ? AnnotationUtils.getValue(annotation)
-                : propertyValue);
-    }
-
-    private static void assertPageableUniqueness(MethodParameter parameter) {
-        Method method = parameter.getMethod();
-
-        if (containsMoreThanOnePageableParameter(method)) {
-            Annotation[][] annotations = method.getParameterAnnotations();
-            assertQualifiersFor(method.getParameterTypes(), annotations);
-        }
-    }
-
-    private static boolean containsMoreThanOnePageableParameter(Method method) {
-        boolean pageableFound = false;
-        for (Class<?> type : method.getParameterTypes()) {
-
-            if (pageableFound && type.equals(Pageable.class)) {
-                return true;
-            }
-
-            if (type.equals(Pageable.class)) {
-                pageableFound = true;
-            }
-        }
-
-        return false;
-    }
-
-    private static void assertQualifiersFor(Class<?>[] parameterTypes, Annotation[][] annotations) {
-        Set<String> values = new HashSet<String>();
-        for (int i = 0; i < annotations.length; i++) {
-            if (Pageable.class.equals(parameterTypes[i])) {
-                Qualifier qualifier = findAnnotation(annotations[i]);
-
-                if (null == qualifier) {
-                    throw new IllegalStateException(
-                            "Ambiguous Pageable arguments in handler method. If you use multiple parameters of type Pageable you need to qualify them with @Qualifier");
-                }
-
-                if (values.contains(qualifier.value())) {
-                    throw new IllegalStateException("Values of the user Qualifiers must be unique!");
-                }
-
-                values.add(qualifier.value());
-            }
-        }
-    }
-
-    private static Qualifier findAnnotation(Annotation[] annotations) {
-        for (Annotation annotation : annotations) {
-            if (annotation instanceof Qualifier) {
-                return (Qualifier) annotation;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java
deleted file mode 100644
index dd10a938ed..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class Sort {
-
-    private Sort() {
-    }
-
-    public static org.springframework.data.domain.Sort of(org.springframework.data.domain.Sort.Direction direction, String... properties) {
-        org.springframework.data.domain.Sort.Order[] orders = new org.springframework.data.domain.Sort.Order[properties.length];
-        for (int i = 0; i < properties.length; i++) {
-            orders[i] = new org.springframework.data.domain.Sort.Order(direction, properties[i]);
-        }
-
-        return of(orders);
-    }
-
-    public static org.springframework.data.domain.Sort of(org.springframework.data.domain.Sort.Order... orders) {
-        Object[] arguments = new Object[]{ orders };
-        try {
-            Method by = org.springframework.data.domain.Sort.class.getMethod("by", org.springframework.data.domain.Sort.Order[].class);
-            return (org.springframework.data.domain.Sort) by.invoke(null, arguments);
-        } catch (Exception ex) {
-            try {
-                Constructor constructor = org.springframework.data.domain.Sort.class.getConstructor(org.springframework.data.domain.Sort.Order[].class);
-                return (org.springframework.data.domain.Sort) constructor.newInstance(arguments);
-            } catch (Exception ex1) {
-                throw new RuntimeException(ex1);
-            }
-        }
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java
deleted file mode 100644
index d340da224a..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl.json;
-
-import com.blazebit.persistence.integration.jackson.EntityViewAwareObjectMapper;
-import com.blazebit.persistence.integration.jackson.EntityViewIdValueAccessor;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJacksonInputMessage;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class EntityViewAwareMappingJackson2HttpMessageConverter extends MappingJackson2HttpMessageConverter {
-
-    private final EntityViewAwareObjectMapper entityViewAwareObjectMapper;
-
-    public EntityViewAwareMappingJackson2HttpMessageConverter(final EntityViewManager entityViewManager, EntityViewIdValueAccessor entityViewIdValueAccessor, ObjectMapper objectMapper) {
-        super(objectMapper);
-        this.entityViewAwareObjectMapper = new EntityViewAwareObjectMapper(entityViewManager, objectMapper, entityViewIdValueAccessor);
-    }
-
-    @Override
-    public boolean canRead(Class<?> clazz, MediaType mediaType) {
-        if (!entityViewAwareObjectMapper.canRead(clazz)) {
-            return false;
-        }
-        return super.canRead(clazz, mediaType);
-    }
-
-    @Override
-    public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
-        JavaType javaType = getJavaType(type, contextClass);
-        if (!entityViewAwareObjectMapper.canRead(javaType)) {
-            return false;
-        }
-        return super.canRead(type, contextClass, mediaType);
-    }
-
-    @Override
-    public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-        return false;
-    }
-
-    @Override
-    public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
-        return false;
-    }
-
-    @Override
-    public Object read(Type type, Class<?> contextClass, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
-        JavaType javaType = getJavaType(type, contextClass);
-        return readJavaType(javaType, inputMessage);
-    }
-
-    private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) {
-        try {
-            if (inputMessage instanceof MappingJacksonInputMessage) {
-                Class<?> deserializationView = ((MappingJacksonInputMessage) inputMessage).getDeserializationView();
-                if (deserializationView != null) {
-                    return this.getObjectMapper().readerWithView(deserializationView).forType(javaType).
-                            readValue(inputMessage.getBody());
-                }
-            }
-            return entityViewAwareObjectMapper.readerFor(javaType).readValue(inputMessage.getBody());
-        } catch (IOException ex) {
-            throw new HttpMessageNotReadableException("Could not read document: " + ex.getMessage(), ex);
-        }
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java
deleted file mode 100644
index 7ba8a09c64..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl.json;
-
-import com.blazebit.persistence.spring.data.webmvc.EntityViewId;
-import com.blazebit.persistence.view.EntityViewManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.web.bind.ServletRequestBindingException;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.AsyncHandlerInterceptor;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.HandlerMapping;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.Map;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class EntityViewIdHandlerInterceptor implements HandlerInterceptor, AsyncHandlerInterceptor {
-
-    private static final Logger LOG = LoggerFactory.getLogger(EntityViewIdHandlerInterceptor.class);
-
-    private final EntityViewManager evm;
-    private final EntityViewIdValueHolder entityViewIdValueHolder;
-
-    public EntityViewIdHandlerInterceptor(EntityViewManager evm, EntityViewIdValueHolder entityViewIdValueHolder) {
-        this.evm = evm;
-        this.entityViewIdValueHolder = entityViewIdValueHolder;
-    }
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, Object handler) throws Exception {
-        if (handler instanceof HandlerMethod) {
-            Map<String, String> uriTemplateVars = (Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-            HandlerMethod handlerMethod = (HandlerMethod) handler;
-            String entityViewIdPathVariableName = resolveEntityViewIdPathVariableName(handlerMethod);
-            if (entityViewIdPathVariableName != null) {
-                if (entityViewIdPathVariableName.isEmpty()) {
-                    throw new ServletRequestBindingException("Failed to resolve entity view path variable name for handler method " + handlerMethod);
-                } else {
-                    String pathVariableValue = uriTemplateVars.get(entityViewIdPathVariableName);
-                    if (pathVariableValue == null) {
-                        throw new ServletRequestBindingException("Missing URI template variable '" + pathVariableValue + "' for handler method " + handlerMethod);
-                    } else {
-                        this.entityViewIdValueHolder.value.set(pathVariableValue);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        this.entityViewIdValueHolder.value.remove();
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-        this.entityViewIdValueHolder.value.remove();
-    }
-
-    private String resolveEntityViewIdPathVariableName(HandlerMethod handlerMethod) {
-        String pathVariableName;
-        EntityViewId entityViewId = null;
-        MethodParameter entityViewIdMethodParameter = null;
-        for (int i = 0; i < handlerMethod.getMethodParameters().length; i++) {
-            MethodParameter methodParameter = handlerMethod.getMethodParameters()[i];
-            entityViewId = methodParameter.getParameterAnnotation(EntityViewId.class);
-            if (entityViewId != null) {
-                if (evm.getMetamodel().managedView(methodParameter.getParameterType()) == null) {
-                    LOG.warn("Handler argument " + methodParameter + " is annotated with @" + EntityViewId.class.getName() +
-                            " but its type [" + methodParameter.getNestedParameterType().getName() +
-                            "] is not an entity view.");
-                    // log warning
-                } else {
-                    entityViewIdMethodParameter = handlerMethod.getMethodParameters()[i];
-                }
-                break;
-            }
-        }
-        if (entityViewIdMethodParameter != null) {
-            pathVariableName = entityViewId.name();
-            if (pathVariableName.isEmpty()) {
-                pathVariableName = entityViewIdMethodParameter.getParameterName();
-                if (pathVariableName == null) {
-                    throw new IllegalArgumentException(
-                            "Entity view id path variable name for argument type [" + entityViewIdMethodParameter.getNestedParameterType().getName() +
-                                    "] not available, and parameter name information not found in class file either.");
-                }
-            }
-        } else {
-            pathVariableName = null;
-        }
-        return pathVariableName;
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdValueHolder.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdValueHolder.java
deleted file mode 100644
index 8be071cb1b..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdValueHolder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.data.webmvc.impl.json;
-
-import com.blazebit.persistence.integration.jackson.EntityViewIdValueAccessor;
-import com.fasterxml.jackson.core.JsonParser;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.validation.DataBinder;
-
-/**
- * @author Moritz Becker
- * @since 1.5.0
- */
-public class EntityViewIdValueHolder implements EntityViewIdValueAccessor {
-
-    final ThreadLocal<Object> value = new ThreadLocal<>();
-    private final DataBinder dataBinder;
-
-    public EntityViewIdValueHolder(ConversionService conversionService) {
-        dataBinder = new DataBinder(null);
-        dataBinder.setConversionService(conversionService);
-    }
-
-    @Override
-    public <T> T getValue(JsonParser jsonParser, Class<T> idType) {
-        Object rawValue = value.get();
-        return rawValue == null ? null : dataBinder.convertIfNecessary(rawValue, idType);
-    }
-}
diff --git a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java b/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java
deleted file mode 100644
index c2c057dd3e..0000000000
--- a/integration/spring-data/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-/**
- * Blaze-Persistence Spring Data WebMvc integration.
- *
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-package com.blazebit.persistence.spring.data.webmvc;
diff --git a/integration/spring-data/webmvc/pom.xml b/integration/spring-data/webmvc/pom.xml
index 603b4579b7..e7074927f8 100644
--- a/integration/spring-data/webmvc/pom.xml
+++ b/integration/spring-data/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,9 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.spring.data.webmvc</module.name>
-        <spring.activeProfiles />
         <test.argLine />
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
     </properties>
 
     <dependencyManagement>
@@ -31,9 +32,34 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${version.servlet}</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${version.servlet-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -46,10 +72,21 @@
             <artifactId>spring-webmvc</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${version.spring-data}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${version.spring-data}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -71,12 +108,12 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.activation}</version>
+            <version>${version.activation-api}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -93,309 +130,53 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive spring.webmvc;
-                                        requires transitive com.blazebit.persistence.integration.spring.data;
-                                        requires com.blazebit.persistence.integration.jackson;
-                                        exports com.blazebit.persistence.spring.data.webmvc;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <!-- Profiles for various Spring-Data versions -->
-        <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-1.x-spring}</version.spring>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>1.13.10.RELEASE</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.0-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.0}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.1-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.1}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.2}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.3}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.4}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.5}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.6}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>spring-data-3.1.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
+                <version.spring>${version.spring-data-3.1-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <optional>true</optional>
-                </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.1 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>spring-data-3.2.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
+                <version.spring>${version.spring-data-3.2-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <optional>true</optional>
-                </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.2 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>spring-data-3.3.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.springframework.data</groupId>
-                    <artifactId>spring-data-commons</artifactId>
-                    <version>${version.spring-data-2.7}</version>
-                    <optional>true</optional>
-                </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java
index 64cd0a9f1b..b95c690ab4 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/EntityViewId.java
@@ -20,7 +20,8 @@
  * The type of the annotated parameter must be an entity view type.
  *
  * @author Moritz Becker
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Target({ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java
index 1cd891ccd2..d3eb8a78c8 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetConfig.java
@@ -16,7 +16,8 @@
  * Required configuration for a {@link KeysetPageable} that specifies the keyset element type.
  *
  * @author Christian Beikov
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java
index d925e8625f..5b7fe79424 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/KeysetPageableArgumentResolver.java
@@ -18,7 +18,8 @@
  * in a {@link Pageable} object or {@literal null} if {@link KeysetPageable} cannot be resolved.
  *
  * @author Moritz Becker
- * @since 1.4.1
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public interface KeysetPageableArgumentResolver extends PageableArgumentResolver {
     /**
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java
index da28388900..4a93853824 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/BlazePersistenceWebConfiguration.java
@@ -22,16 +22,16 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import java.util.List;
 
 /**
  * @author Christian Beikov
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Configuration
-public class BlazePersistenceWebConfiguration extends WebMvcConfigurerAdapter {
+public class BlazePersistenceWebConfiguration implements WebMvcConfigurer {
 
     protected final ObjectFactory<ConversionService> conversionService;
     protected final ObjectMapper objectMapper;
@@ -56,8 +56,7 @@ public KeysetPageableArgumentResolver blazeWebmvcKeysetPageableResolver() {
 
     @Bean
     public SortHandlerMethodArgumentResolver blazeWebmvcKeysetSortResolver() {
-        SortHandlerMethodArgumentResolver sortResolver = new SortHandlerMethodArgumentResolver();
-        return sortResolver;
+        return new SortHandlerMethodArgumentResolver();
     }
 
     @Override
@@ -74,7 +73,7 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
 
     @Override
     public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-        // Add it to the beginning so it has precedence over the builtin
+        // Add it to the beginning, so it has precedence over the builtin
         converters.add(0, new EntityViewAwareMappingJackson2HttpMessageConverter(entityViewManager, blazeWebmvcIdAttributeAccessor(), objectMapper()));
     }
 
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java
index 6ad654c2d5..4b09a40932 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/KeysetPageableHandlerMethodArgumentResolver.java
@@ -48,7 +48,8 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class KeysetPageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolver implements KeysetPageableArgumentResolver {
 
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java
index 3300cca0ed..dd10a938ed 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/Sort.java
@@ -10,7 +10,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.4.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class Sort {
 
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java
index f0d9554336..d340da224a 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewAwareMappingJackson2HttpMessageConverter.java
@@ -21,7 +21,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.4.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class EntityViewAwareMappingJackson2HttpMessageConverter extends MappingJackson2HttpMessageConverter {
 
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java
index 4aa29f49b4..7ba8a09c64 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/impl/json/EntityViewIdHandlerInterceptor.java
@@ -7,9 +7,6 @@
 
 import com.blazebit.persistence.spring.data.webmvc.EntityViewId;
 import com.blazebit.persistence.view.EntityViewManager;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.MethodParameter;
@@ -18,7 +15,10 @@
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.ModelAndView;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * @author Moritz Becker
@@ -37,7 +37,7 @@ public EntityViewIdHandlerInterceptor(EntityViewManager evm, EntityViewIdValueHo
     }
 
     @Override
-    public boolean preHandle(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, Object handler) throws Exception {
+    public boolean preHandle(HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, Object handler) throws Exception {
         if (handler instanceof HandlerMethod) {
             Map<String, String> uriTemplateVars = (Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
             HandlerMethod handlerMethod = (HandlerMethod) handler;
@@ -59,13 +59,7 @@ public boolean preHandle(javax.servlet.http.HttpServletRequest request, javax.se
     }
 
     @Override
-    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-                           Object o, ModelAndView modelAndView) {
-        // Do nothing - needed for spring-data-1.11.x
-    }
-
-    @Override
-    public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) {
+    public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         this.entityViewIdValueHolder.value.remove();
     }
 
diff --git a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java
index dd549067b3..c2c057dd3e 100644
--- a/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java
+++ b/integration/spring-data/webmvc/src/main/java/com/blazebit/persistence/spring/data/webmvc/package-info.java
@@ -7,6 +7,7 @@
  * Blaze-Persistence Spring Data WebMvc integration.
  *
  * @author Christian Beikov
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
-package com.blazebit.persistence.spring.data.webmvc;
\ No newline at end of file
+package com.blazebit.persistence.spring.data.webmvc;
diff --git a/integration/spring-data/webmvc/src/main/java/module-info.java b/integration/spring-data/webmvc/src/main/java/module-info.java
new file mode 100644
index 0000000000..d10e90995d
--- /dev/null
+++ b/integration/spring-data/webmvc/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.data.webmvc {
+	requires transitive spring.webmvc;
+	requires transitive com.blazebit.persistence.integration.spring.data;
+	requires com.blazebit.persistence.integration.jackson;
+	requires spring.data.commons;
+	requires spring.web;
+	requires spring.core;
+	requires com.blazebit.common.utils;
+	requires com.fasterxml.jackson.databind;
+	requires spring.beans;
+	requires org.slf4j;
+	requires jakarta.servlet;
+	requires com.fasterxml.jackson.core;
+	exports com.blazebit.persistence.spring.data.webmvc;
+	exports com.blazebit.persistence.spring.data.webmvc.impl;
+}
\ No newline at end of file
diff --git a/integration/spring-data/webmvc/src/main/resources/META-INF/spring.factories b/integration/spring-data/webmvc/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index fd11dec516..0000000000
--- a/integration/spring-data/webmvc/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.blazebit.persistence.spring.data.webmvc.impl.BlazePersistenceWebConfiguration
diff --git a/integration/spring-data/webmvc-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/integration/spring-data/webmvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from integration/spring-data/webmvc-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to integration/spring-data/webmvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/integration/spring-hateoas/pom.xml b/integration/spring-hateoas/pom.xml
index 299817b7fe..fc76f1186f 100644
--- a/integration/spring-hateoas/pom.xml
+++ b/integration/spring-hateoas/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,20 +21,6 @@
 
     <modules>
         <module>webmvc</module>
-<!--        <module>webmvc-jakarta</module>-->
     </modules>
 
-    <!-- Spring 6 is compiled with JDK 17, so we can only compile it, if we the build is running on a JDK 17 -->
-    <profiles>
-        <profile>
-            <id>jdk17+</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <modules>
-                <module>webmvc</module>
-                <module>webmvc-jakarta</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration/spring-hateoas/webmvc-jakarta/log4j.properties b/integration/spring-hateoas/webmvc-jakarta/log4j.properties
deleted file mode 100644
index 9281284590..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2014 - 2024 Blazebit.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Define the destination and format of our logging
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-
-#log4j.category.DataNucleus.Enhancer=DEBUG, A1
\ No newline at end of file
diff --git a/integration/spring-hateoas/webmvc-jakarta/pom.xml b/integration/spring-hateoas/webmvc-jakarta/pom.xml
deleted file mode 100644
index 6d8ac3c503..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/pom.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>blaze-persistence-integration-spring-hateoas-parent</artifactId>
-        <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Blazebit Persistence Integration Spring-HATEOAS WebMvc Jakarta</name>
-    <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-
-    <properties>
-        <module.name>com.blazebit.persistence.integration.spring.hateoas.webmvc</module.name>
-        <test.argLine />
-        <version.spring>${version.spring-data-3.3-spring}</version.spring>
-        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-        <version.spring-hateoas>2.2.2</version.spring-hateoas>
-        <main.java.version>17</main.java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${version.spring}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${version.jakarta-servlet}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.hateoas</groupId>
-            <artifactId>spring-hateoas</artifactId>
-            <version>${version.spring-hateoas}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${version.spring-boot}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.17.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base-3.3</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version.hibernate-6.2}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${version.jakarta-jaxb-api}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>${version.jakarta-jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${version.jakarta-activation}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${version.jakarta-jaxb}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.14.2</version>
-        </dependency>
-        <!-- IntelliJ apparently needs the annotation processor here -->
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>${version.hibernate-6.2}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        exports com.blazebit.persistence.spring.hateoas.webmvc;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,</excludedGroups>
-                    <systemPropertyVariables>
-                        <jdbc.url>jdbc:h2:mem:test</jdbc.url>
-                        <jdbc.user>admin</jdbc.user>
-                        <jdbc.password>admin</jdbc.password>
-                        <jdbc.driver>org.h2.Driver</jdbc.driver>
-                        <activeProfiles>hibernate</activeProfiles>
-                    </systemPropertyVariables>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>${version.surefire.plugin}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                            <processors>
-                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Metamodel -->
-                    <dependency>
-                        <groupId>org.hibernate.orm</groupId>
-                        <artifactId>hibernate-jpamodelgen</artifactId>
-                        <version>${version.hibernate-6.2}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>${version.jakarta-jaxb-api}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.glassfish.jaxb</groupId>
-                        <artifactId>jaxb-runtime</artifactId>
-                        <version>${version.jakarta-jaxb}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                        <version>${version.jakarta-activation}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>${version.jakarta-jaxb}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.transaction</groupId>
-                        <artifactId>jakarta.transaction-api</artifactId>
-                        <version>${version.jta}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/metamodel</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>hibernate-5.6</id>
-            <!--
-            Default to compiling with ORM 6.2 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.hibernate>${version.hibernate-6.5}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
-            </properties>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
-            <!--
-            Default to compiling with Spring Data 3.1 as profile activation gets too complicated
-            for ORM 5.6 + JDK 17 testing
-            -->
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-                <version.spring-hateoas>2.1.5</version.spring-hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>spring-data-3.1.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.1-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
-                <version.spring-hateoas>2.1.5</version.spring-hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.2.x</id>
-            <properties>
-                <version.spring>${version.spring-data-3.2-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
-                <version.spring-hateoas>2.2.2</version.spring-hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-3.3.x</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <version.spring>${version.spring-data-3.3-spring}</version.spring>
-                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
-                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
-                <version.spring-hateoas>2.3.0</version.spring-hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java
deleted file mode 100644
index 2f4118b3e6..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.spring.data.webmvc.impl.BlazePersistenceWebConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigurationImportFilter;
-import org.springframework.boot.autoconfigure.AutoConfigurationMetadata;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Configuration
-public class BlazePersistenceAutoConfigurationImportFilter implements AutoConfigurationImportFilter {
-
-    @Override
-    public boolean[] match(String[] classNames, AutoConfigurationMetadata autoConfigurationMetadata) {
-        boolean[] shouldImport = new boolean[classNames.length];
-        String excludeName = BlazePersistenceWebConfiguration.class.getName();
-        for (int i = 0; i < classNames.length; i++) {
-            shouldImport[i] = !excludeName.equals(classNames[i]);
-        }
-        return shouldImport;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java
deleted file mode 100644
index dcd961cb36..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.spring.data.webmvc.KeysetPageableArgumentResolver;
-import com.blazebit.persistence.spring.data.webmvc.impl.BlazePersistenceWebConfiguration;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.web.HateoasSortHandlerMethodArgumentResolver;
-import org.springframework.hateoas.server.mvc.UriComponentsContributor;
-import org.springframework.hateoas.server.mvc.WebMvcLinkBuilderFactory;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-
-import java.util.List;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Configuration
-public class HateoasAwareBlazePersistenceWebConfiguration extends BlazePersistenceWebConfiguration {
-
-    private final List<? extends UriComponentsContributor> uriComponentsContributors;
-
-    public HateoasAwareBlazePersistenceWebConfiguration(
-            EntityViewManager entityViewManager,
-            @Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService,
-            @Lazy List<UriComponentsContributor> uriComponentsContributors,
-            @Autowired(required = false) ObjectMapper objectMapper) {
-        super(entityViewManager, conversionService, objectMapper);
-        this.uriComponentsContributors = uriComponentsContributors;
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        boolean hasPageableResolver = false;
-        for (int i = 0; i < argumentResolvers.size(); i++) {
-            HandlerMethodArgumentResolver argumentResolver = argumentResolvers.get(i);
-            if (argumentResolver.getClass() == KeysetPageableArgumentResolver.class) {
-                argumentResolvers.remove(i);
-                break;
-            } else if (argumentResolver instanceof HateoasKeysetPageableHandlerMethodArgumentResolver) {
-                hasPageableResolver = true;
-            }
-        }
-        if (!hasPageableResolver) {
-            // Add it to the beginning so it has precedence over the builtin
-            argumentResolvers.add(0, blazeWebmvcKeysetPageableResolver());
-        }
-        argumentResolvers.add(keysetPagedResourcesAssemblerArgumentResolver());
-    }
-
-    @Bean
-    @Override
-    public HateoasKeysetPageableHandlerMethodArgumentResolver blazeWebmvcKeysetPageableResolver() {
-        return new HateoasKeysetPageableHandlerMethodArgumentResolver(blazeWebmvcKeysetSortResolver(), conversionService.getObject(), objectMapper());
-    }
-
-    @Bean
-    @Override
-    public HateoasSortHandlerMethodArgumentResolver blazeWebmvcKeysetSortResolver() {
-        return new HateoasSortHandlerMethodArgumentResolver();
-    }
-
-    @Bean
-    public KeysetAwarePagedResourcesAssembler<?> keysetPagedResourcesAssembler() {
-        return new KeysetAwarePagedResourcesAssembler<Object>(blazeWebmvcKeysetPageableResolver(), null, objectMapper());
-    }
-
-    @Bean
-    public KeysetAwarePagedResourcesAssemblerArgumentResolver keysetPagedResourcesAssemblerArgumentResolver() {
-        WebMvcLinkBuilderFactory linkBuilderFactory = new WebMvcLinkBuilderFactory();
-        linkBuilderFactory.setUriComponentsContributors(uriComponentsContributors);
-        return new KeysetAwarePagedResourcesAssemblerArgumentResolver(blazeWebmvcKeysetPageableResolver(), linkBuilderFactory, objectMapper());
-    }
-
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java
deleted file mode 100644
index 61e3efe132..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.spring.data.webmvc.impl.KeysetPageableHandlerMethodArgumentResolver;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.HateoasSortHandlerMethodArgumentResolver;
-import org.springframework.hateoas.server.mvc.UriComponentsContributor;
-import org.springframework.util.Assert;
-import org.springframework.web.util.UriComponentsBuilder;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class HateoasKeysetPageableHandlerMethodArgumentResolver extends KeysetPageableHandlerMethodArgumentResolver implements UriComponentsContributor {
-
-    private static final HateoasSortHandlerMethodArgumentResolver DEFAULT_SORT_RESOLVER = new HateoasSortHandlerMethodArgumentResolver();
-
-    public HateoasKeysetPageableHandlerMethodArgumentResolver() {
-        super(DEFAULT_SORT_RESOLVER, null, null);
-    }
-
-    public HateoasKeysetPageableHandlerMethodArgumentResolver(HateoasSortHandlerMethodArgumentResolver sortResolver, ConversionService conversionService) {
-        this(sortResolver, conversionService, null);
-    }
-
-    public HateoasKeysetPageableHandlerMethodArgumentResolver(HateoasSortHandlerMethodArgumentResolver sortResolver, ConversionService conversionService, ObjectMapper mapper) {
-        super(getDefaultedSortResolver(sortResolver), conversionService, mapper);
-    }
-
-    @Override
-    public boolean isOneIndexedParameters() {
-        return super.isOneIndexedParameters();
-    }
-
-    @Override
-    public String getParameterNameToUse(String source, MethodParameter parameter) {
-        return super.getParameterNameToUse(source, parameter);
-    }
-
-    @Override
-    public String getPreviousPageParameterName() {
-        return super.getPreviousPageParameterName();
-    }
-
-    @Override
-    public String getLowestParameterName() {
-        return super.getLowestParameterName();
-    }
-
-    @Override
-    public String getHighestParameterName() {
-        return super.getHighestParameterName();
-    }
-
-    @Override
-    public void enhance(UriComponentsBuilder builder, MethodParameter parameter, Object value) {
-        Assert.notNull(builder, "UriComponentsBuilder must not be null!");
-
-        if (!(value instanceof Pageable)) {
-            return;
-        }
-
-        Pageable pageable = (Pageable) value;
-
-        if (pageable.isUnpaged()) {
-            return;
-        }
-
-        String pagePropertyName = getParameterNameToUse(getPageParameterName(), parameter);
-        String sizePropertyName = getParameterNameToUse(getSizeParameterName(), parameter);
-
-        int pageNumber = pageable.getPageNumber();
-
-        // TODO: handle offset etc.
-        builder.replaceQueryParam(pagePropertyName, isOneIndexedParameters() ? pageNumber + 1 : pageNumber);
-        builder.replaceQueryParam(sizePropertyName, Math.min(pageable.getPageSize(), getMaxPageSize()));
-
-        ((HateoasSortHandlerMethodArgumentResolver) getSortResolver()).enhance(builder, parameter, pageable.getSort());
-    }
-
-    private static HateoasSortHandlerMethodArgumentResolver getDefaultedSortResolver(HateoasSortHandlerMethodArgumentResolver sortResolver) {
-        return sortResolver == null ? DEFAULT_SORT_RESOLVER : sortResolver;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java
deleted file mode 100644
index c2d78c795e..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.core.MethodParameter;
-import org.springframework.util.Assert;
-import org.springframework.web.util.UriComponents;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-class KeysetAwareMethodParameterAwarePagedResourcesAssembler<T> extends KeysetAwarePagedResourcesAssembler<T> {
-
-    private final MethodParameter parameter;
-
-    public KeysetAwareMethodParameterAwarePagedResourcesAssembler(MethodParameter parameter, HateoasKeysetPageableHandlerMethodArgumentResolver resolver, UriComponents baseUri, ObjectMapper objectMapper) {
-        super(resolver, baseUri, objectMapper);
-
-        Assert.notNull(parameter, "Method parameter must not be null!");
-        this.parameter = parameter;
-    }
-
-    @Override
-    protected MethodParameter getMethodParameter() {
-        return parameter;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java
deleted file mode 100644
index 6ce4609b67..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.Keyset;
-import com.blazebit.persistence.KeysetPage;
-import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.core.MethodParameter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.IanaLinkRelations;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.LinkRelation;
-import org.springframework.hateoas.PagedModel;
-import org.springframework.hateoas.PagedModel.PageMetadata;
-import org.springframework.hateoas.RepresentationModel;
-import org.springframework.hateoas.UriTemplate;
-import org.springframework.hateoas.server.RepresentationModelAssembler;
-import org.springframework.hateoas.server.core.EmbeddedWrapper;
-import org.springframework.hateoas.server.core.EmbeddedWrappers;
-import org.springframework.util.Assert;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import static org.springframework.web.util.UriComponentsBuilder.fromUri;
-import static org.springframework.web.util.UriComponentsBuilder.fromUriString;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class KeysetAwarePagedResourcesAssembler<T> implements RepresentationModelAssembler<Page<T>, PagedModel<EntityModel<T>>> {
-
-    private static final Constructor<EntityModel> ENTITY_MODEL_CONSTRUCTOR;
-    private static final Constructor<PagedModel> PAGED_MODEL_CONSTRUCTOR;
-    private static final Constructor<Link> LINK_CONSTRUCTOR;
-
-    private static final Method ENTITY_MODEL_FACTORY;
-    private static final Method PAGED_MODEL_FACTORY;
-    private static final Method LINK_FACTORY;
-
-    static {
-        Method entityModelFactory = null;
-        Method pagedModelFactory = null;
-        Method linkFactory = null;
-        Constructor<EntityModel> entityModelConstructor = null;
-        Constructor<PagedModel> pagedModelConstructor = null;
-        Constructor<Link> linkConstructor = null;
-        try {
-            entityModelFactory = EntityModel.class.getMethod("of", Object.class);
-            pagedModelFactory = PagedModel.class.getMethod("of", Collection.class, PageMetadata.class);
-            linkFactory = Link.class.getMethod("of", UriTemplate.class, LinkRelation.class);
-        } catch (NoSuchMethodException e) {
-            try {
-                entityModelConstructor = EntityModel.class.getConstructor(Object.class, Link[].class);
-                pagedModelConstructor = PagedModel.class.getConstructor(Collection.class, PageMetadata.class, Link[].class);
-                linkConstructor = Link.class.getConstructor(UriTemplate.class, LinkRelation.class);
-            } catch (NoSuchMethodException noSuchMethodException) {
-                throw new RuntimeException("Could not determine how to construct EntityModel, PagedModel and Link with the given Spring HATEOAS version. Please report this issue!", noSuchMethodException);
-            }
-        }
-        ENTITY_MODEL_CONSTRUCTOR = entityModelConstructor;
-        PAGED_MODEL_CONSTRUCTOR = pagedModelConstructor;
-        LINK_CONSTRUCTOR = linkConstructor;
-        ENTITY_MODEL_FACTORY = entityModelFactory;
-        PAGED_MODEL_FACTORY = pagedModelFactory;
-        LINK_FACTORY = linkFactory;
-    }
-
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    private final HateoasKeysetPageableHandlerMethodArgumentResolver pageableResolver;
-    private final Optional<UriComponents> baseUri;
-    private final ObjectMapper objectMapper;
-    private final EmbeddedWrappers wrappers = new EmbeddedWrappers(false);
-
-    private boolean forceFirstAndLastRels = false;
-
-    public KeysetAwarePagedResourcesAssembler(HateoasKeysetPageableHandlerMethodArgumentResolver resolver, UriComponents baseUri, ObjectMapper objectMapper) {
-        this.pageableResolver = resolver == null ? new HateoasKeysetPageableHandlerMethodArgumentResolver() : resolver;
-        this.baseUri = Optional.ofNullable(baseUri);
-        this.objectMapper = objectMapper == null ? OBJECT_MAPPER : objectMapper;
-    }
-
-    public void setForceFirstAndLastRels(boolean forceFirstAndLastRels) {
-        this.forceFirstAndLastRels = forceFirstAndLastRels;
-    }
-
-    @Override
-    public PagedModel<EntityModel<T>> toModel(Page<T> entity) {
-        return toModel(entity, it -> entityModel(it));
-    }
-
-    public PagedModel<EntityModel<T>> toModel(Page<T> page, Link selfLink) {
-        return toModel(page, it -> entityModel(it), selfLink);
-    }
-
-    private EntityModel<T> entityModel(T content) {
-        try {
-            if (ENTITY_MODEL_FACTORY == null) {
-                return ENTITY_MODEL_CONSTRUCTOR.newInstance(content, new Link[0]);
-            } else {
-                return (EntityModel<T>) ENTITY_MODEL_FACTORY.invoke(null, content);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Couldn't instantiate EntityModel", ex);
-        }
-    }
-
-    public <R extends RepresentationModel<?>> PagedModel<R> toModel(Page<T> page, RepresentationModelAssembler<T, R> assembler) {
-        return createModel(page, assembler, Optional.empty());
-    }
-
-    public <R extends RepresentationModel<?>> PagedModel<R> toModel(Page<T> page, RepresentationModelAssembler<T, R> assembler, Link link) {
-        Assert.notNull(link, "Link must not be null!");
-        return createModel(page, assembler, Optional.of(link));
-    }
-
-    public PagedModel<?> toEmptyModel(Page<?> page, Class<?> type) {
-        return toEmptyModel(page, type, Optional.empty());
-    }
-
-    public PagedModel<?> toEmptyModel(Page<?> page, Class<?> type, Link link) {
-        return toEmptyModel(page, type, Optional.of(link));
-    }
-
-    private PagedModel<?> toEmptyModel(Page<?> page, Class<?> type, Optional<Link> link) {
-        Assert.notNull(page, "Page must not be null!");
-        Assert.isTrue(!page.hasContent(), "Page must not have any content!");
-        Assert.notNull(type, "Type must not be null!");
-        Assert.notNull(link, "Link must not be null!");
-
-        PageMetadata metadata = asPageMetadata(page);
-
-        EmbeddedWrapper wrapper = wrappers.emptyCollectionOf(type);
-        List<EmbeddedWrapper> embedded = Collections.singletonList(wrapper);
-
-        return addPaginationLinks(pagedModel(embedded, metadata), page, link);
-    }
-
-    protected <R extends RepresentationModel<?>, S> PagedModel<R> createPagedModel(List<R> resources, PageMetadata metadata, Page<S> page) {
-        Assert.notNull(resources, "Content resources must not be null!");
-        Assert.notNull(metadata, "PageMetadata must not be null!");
-        Assert.notNull(page, "Page must not be null!");
-
-        return pagedModel(resources, metadata);
-    }
-
-    private <R> PagedModel<R> pagedModel(Collection<R> resources, PagedModel.PageMetadata metadata) {
-        try {
-            if (PAGED_MODEL_FACTORY == null) {
-                return PAGED_MODEL_CONSTRUCTOR.newInstance(resources, metadata, new Link[0]);
-            } else {
-                return (PagedModel<R>) PAGED_MODEL_FACTORY.invoke(null, resources, metadata);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Couldn't instantiate PagedModel", ex);
-        }
-    }
-
-    private <S, R extends RepresentationModel<?>> PagedModel<R> createModel(Page<S> page, RepresentationModelAssembler<S, R> assembler, Optional<Link> link) {
-        Assert.notNull(page, "Page must not be null!");
-        Assert.notNull(assembler, "ResourceAssembler must not be null!");
-
-        List<R> resources = new ArrayList<>(page.getNumberOfElements());
-
-        for (S element : page) {
-            resources.add(assembler.toModel(element));
-        }
-
-        PagedModel<R> resource = createPagedModel(resources, asPageMetadata(page), page);
-
-        return addPaginationLinks(resource, page, link);
-    }
-
-    private <R> PagedModel<R> addPaginationLinks(PagedModel<R> resources, Page<?> page, Optional<Link> link) {
-        UriTemplate base = getUriTemplate(link);
-
-        boolean isNavigable = page.hasPrevious() || page.hasNext();
-
-        if (isNavigable || forceFirstAndLastRels) {
-            resources.add(createLink(base, page, PageRequest.of(0, page.getSize(), page.getSort()), IanaLinkRelations.FIRST));
-        }
-
-        if (page.hasPrevious()) {
-            resources.add(createLink(base, page, page.previousPageable(), IanaLinkRelations.PREV));
-        }
-
-        Link selfLink = link.map(it -> it.withSelfRel())//
-                .orElseGet(() -> createLink(base, page, page.getPageable(), IanaLinkRelations.SELF));
-
-        resources.add(selfLink);
-
-        if (page.hasNext()) {
-            resources.add(createLink(base, page, page.nextPageable(), IanaLinkRelations.NEXT));
-        }
-
-        if (isNavigable || forceFirstAndLastRels) {
-            int lastIndex = page.getTotalPages() == 0 ? 0 : page.getTotalPages() - 1;
-            resources.add(createLink(base, page, PageRequest.of(lastIndex, page.getSize(), page.getSort()), IanaLinkRelations.LAST));
-        }
-
-        return resources;
-    }
-
-    private UriTemplate getUriTemplate(Optional<Link> baseLink) {
-        return UriTemplate.of(baseLink.map(Link::getHref).orElseGet(this::baseUriOrCurrentRequest));
-    }
-
-    private Link createLink(UriTemplate base, Page<?> page, Pageable pageable, LinkRelation relation) {
-        UriComponentsBuilder builder;
-        if (base.getVariables().isEmpty()) {
-            builder = fromUriString(base.toString());
-        } else {
-            builder = fromUri(base.expand());
-        }
-        pageableResolver.enhance(builder, getMethodParameter(), pageable);
-
-        String previousPagePropertyName = pageableResolver.getParameterNameToUse(pageableResolver.getPreviousPageParameterName(), getMethodParameter());
-        String lowestPropertyName = pageableResolver.getParameterNameToUse(pageableResolver.getLowestParameterName(), getMethodParameter());
-        String highestPropertyName = pageableResolver.getParameterNameToUse(pageableResolver.getHighestParameterName(), getMethodParameter());
-
-        if ((relation == IanaLinkRelations.NEXT || relation == IanaLinkRelations.PREV) && page instanceof KeysetAwarePage<?>) {
-            int pageNumber = page.getNumber();
-            builder.replaceQueryParam(previousPagePropertyName, pageableResolver.isOneIndexedParameters() ? pageNumber + 1 : pageNumber);
-
-            Sort sort = page.getSort();
-            KeysetPage keysetPage = ((KeysetAwarePage<?>) page).getKeysetPage();
-            if (relation == IanaLinkRelations.NEXT) {
-                builder.replaceQueryParam(highestPropertyName, serialize(sort, keysetPage.getHighest()));
-                builder.replaceQueryParam(lowestPropertyName);
-            } else if (pageable.getOffset() != 0) {
-                builder.replaceQueryParam(lowestPropertyName, serialize(sort, keysetPage.getLowest()));
-                builder.replaceQueryParam(highestPropertyName);
-            } else {
-                builder.replaceQueryParam(previousPagePropertyName);
-                builder.replaceQueryParam(lowestPropertyName);
-                builder.replaceQueryParam(highestPropertyName);
-            }
-        } else {
-            builder.replaceQueryParam(previousPagePropertyName);
-            builder.replaceQueryParam(lowestPropertyName);
-            builder.replaceQueryParam(highestPropertyName);
-        }
-
-        return link(UriTemplate.of(builder.build().toString()), relation);
-    }
-
-    private Link link(UriTemplate template, LinkRelation rel) {
-        try {
-            if (LINK_FACTORY == null) {
-                return LINK_CONSTRUCTOR.newInstance(template, rel);
-            } else {
-                return (Link) LINK_FACTORY.invoke(null, template, rel);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Couldn't instantiate Link", ex);
-        }
-    }
-
-    private String serialize(Sort sort, Keyset keyset) {
-        try {
-            StringBuilder sb = new StringBuilder();
-            sb.append('{');
-            int index = 0;
-            for (Sort.Order order : sort) {
-                if (index != 0) {
-                    sb.append(',');
-                }
-                sb.append('"').append(order.getProperty()).append("\":");
-                Serializable value = keyset.getTuple()[index];
-                sb.append(objectMapper.writeValueAsString(value));
-                index++;
-            }
-            sb.append('}');
-            return sb.toString();
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected MethodParameter getMethodParameter() {
-        return null;
-    }
-
-    private PageMetadata asPageMetadata(Page<?> page) {
-        Assert.notNull(page, "Page must not be null!");
-
-        int number = pageableResolver.isOneIndexedParameters() ? page.getNumber() + 1 : page.getNumber();
-
-        return new PageMetadata(page.getSize(), number, page.getTotalElements(), page.getTotalPages());
-    }
-
-    private String baseUriOrCurrentRequest() {
-        return baseUri.map(Object::toString).orElseGet(KeysetAwarePagedResourcesAssembler::currentRequest);
-    }
-
-    private static String currentRequest() {
-        return ServletUriComponentsBuilder.fromCurrentRequest().build().toString();
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java b/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java
deleted file mode 100644
index 278f537dbd..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.MethodParameter;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.server.MethodLinkBuilderFactory;
-import org.springframework.hateoas.server.core.MethodParameters;
-import org.springframework.hateoas.server.mvc.WebMvcLinkBuilderFactory;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.ModelAndViewContainer;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class KeysetAwarePagedResourcesAssemblerArgumentResolver implements HandlerMethodArgumentResolver {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(KeysetAwarePagedResourcesAssemblerArgumentResolver.class);
-
-    private static final String SUPERFLOUS_QUALIFIER = "Found qualified {} parameter, but a unique unqualified {} parameter. Using that one, but you might want to check your controller method configuration!";
-    private static final String PARAMETER_AMBIGUITY = "Discovered multiple parameters of type Pageable but no qualifier annotations to disambiguate!";
-
-    private final HateoasKeysetPageableHandlerMethodArgumentResolver resolver;
-    private final MethodLinkBuilderFactory<?> linkBuilderFactory;
-    private final ObjectMapper objectMapper;
-
-    public KeysetAwarePagedResourcesAssemblerArgumentResolver(HateoasKeysetPageableHandlerMethodArgumentResolver resolver, MethodLinkBuilderFactory<?> linkBuilderFactory, ObjectMapper objectMapper) {
-        this.resolver = resolver;
-        this.linkBuilderFactory = linkBuilderFactory == null ? new WebMvcLinkBuilderFactory() : linkBuilderFactory;
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public boolean supportsParameter(MethodParameter parameter) {
-        return KeysetAwarePagedResourcesAssembler.class.equals(parameter.getParameterType());
-    }
-
-    @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
-        UriComponents fromUriString = resolveBaseUri(parameter, webRequest);
-        MethodParameter pageableParameter = findMatchingPageableParameter(parameter);
-
-        if (pageableParameter != null) {
-            return new KeysetAwareMethodParameterAwarePagedResourcesAssembler<>(pageableParameter, resolver, fromUriString, objectMapper);
-        } else {
-            return new KeysetAwarePagedResourcesAssembler<>(resolver, fromUriString, objectMapper);
-        }
-    }
-
-    private UriComponents resolveBaseUri(MethodParameter parameter, NativeWebRequest webRequest) {
-        Method method = parameter.getMethod();
-
-        if (method == null) {
-            throw new IllegalArgumentException(String.format("Could not obtain method from parameter %s!", parameter));
-        }
-
-        try {
-            Link linkToMethod = linkBuilderFactory.linkTo(parameter.getDeclaringClass(), method, new Object[method.getParameterCount()]).withSelfRel();
-            UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(linkToMethod.getHref());
-            for (Map.Entry<String, String[]> entry : webRequest.getParameterMap().entrySet()) {
-                builder.queryParam(entry.getKey(), (Object[]) entry.getValue());
-            }
-
-            return builder.build();
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-
-    private static MethodParameter findMatchingPageableParameter(MethodParameter parameter) {
-        Method method = parameter.getMethod();
-
-        if (method == null) {
-            throw new IllegalArgumentException(String.format("Could not obtain method from parameter %s!", parameter));
-        }
-
-        MethodParameters parameters = MethodParameters.of(method);
-        List<MethodParameter> pageableParameters = parameters.getParametersOfType(KeysetPageable.class);
-        Qualifier assemblerQualifier = parameter.getParameterAnnotation(Qualifier.class);
-
-        if (pageableParameters.isEmpty()) {
-            return null;
-        }
-
-        if (pageableParameters.size() == 1) {
-            MethodParameter pageableParameter = pageableParameters.get(0);
-            MethodParameter matchingParameter = returnIfQualifiersMatch(pageableParameter, assemblerQualifier);
-
-            if (matchingParameter == null) {
-                LOGGER.info(SUPERFLOUS_QUALIFIER, KeysetAwarePagedResourcesAssembler.class.getSimpleName(), KeysetPageable.class.getName());
-            }
-
-            return pageableParameter;
-        }
-
-        if (assemblerQualifier == null) {
-            throw new IllegalStateException(PARAMETER_AMBIGUITY);
-        }
-
-        for (MethodParameter pageableParameter : pageableParameters) {
-            MethodParameter matchingParameter = returnIfQualifiersMatch(pageableParameter, assemblerQualifier);
-
-            if (matchingParameter != null) {
-                return matchingParameter;
-            }
-        }
-
-        throw new IllegalStateException(PARAMETER_AMBIGUITY);
-    }
-
-    private static MethodParameter returnIfQualifiersMatch(MethodParameter pageableParameter, Qualifier assemblerQualifier) {
-        if (assemblerQualifier == null) {
-            return pageableParameter;
-        }
-
-        Qualifier pageableParameterQualifier = pageableParameter.getParameterAnnotation(Qualifier.class);
-
-        if (pageableParameterQualifier == null) {
-            return null;
-        }
-
-        return pageableParameterQualifier.value().equals(assemblerQualifier.value()) ? pageableParameter : null;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring.factories b/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 97ae6ac034..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=com.blazebit.persistence.spring.hateoas.webmvc.BlazePersistenceAutoConfigurationImportFilter
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 7fb7489c43..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.blazebit.persistence.spring.hateoas.webmvc.HateoasAwareBlazePersistenceWebConfiguration
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java
deleted file mode 100644
index e6fbc26ebb..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.spring.hateoas.webmvc.config.CustomLocalContainerEntityManagerFactoryBean;
-import com.blazebit.persistence.spring.hateoas.webmvc.config.SystemPropertyBasedActiveProfilesResolver;
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Document;
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Person;
-import com.blazebit.persistence.testsuite.base.AbstractPersistenceTest;
-import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.TestContextManager;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@ActiveProfiles(resolver = SystemPropertyBasedActiveProfilesResolver.class)
-public abstract class AbstractSpringTest extends AbstractPersistenceTest {
-
-    private TestContextManager testContextManager;
-
-    @Override
-    protected Class<?>[] getEntityClasses() {
-        return new Class[] {
-                Document.class,
-                Person.class
-        };
-    }
-
-    @Override
-    protected void configurePersistenceUnitInfo(MutablePersistenceUnitInfo persistenceUnitInfo) {
-        // No-op
-    }
-
-    @Before
-    public void setUpContext() throws Exception {
-        // We have to close the EM and EMF constructed by the abstraction
-        cleanDatabase();
-        this.em.getTransaction().rollback();
-        this.em.close();
-        this.emf.close();
-        this.emf = null;
-        this.em = null;
-        this.cbf = null;
-        this.jpaProvider = null;
-        this.dbmsDialect = null;
-
-        //this is where the magic happens, we actually do "by hand" what the spring runner would do for us,
-        // read the JavaDoc for the class bellow to know exactly what it does, the method names are quite accurate though
-        CustomLocalContainerEntityManagerFactoryBean.properties = createProperties("none");
-        testContextManager = new TestContextManager(getClass());
-        testContextManager.prepareTestInstance(this);
-        testContextManager.registerTestExecutionListeners(new DirtiesContextTestExecutionListener());
-    }
-
-    @After
-    public void tearDownContext() throws Exception {
-        //this is where the magic happens, we actually do "by hand" what the spring runner would do for us,
-        // read the JavaDoc for the class bellow to know exactly what it does, the method names are quite accurate though
-        testContextManager.getTestContext().markApplicationContextDirty(DirtiesContext.HierarchyMode.EXHAUSTIVE);
-        testContextManager.getTestContext().setAttribute(DependencyInjectionTestExecutionListener.REINJECT_DEPENDENCIES_ATTRIBUTE, Boolean.TRUE);
-    }
-
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java
deleted file mode 100644
index eba0c571c7..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.view.IdMapping;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import org.junit.Before;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@WebAppConfiguration
-public abstract class AbstractSpringWebMvcTest extends AbstractSpringTest {
-
-    @Autowired
-    private WebApplicationContext wac;
-
-    protected MockMvc mockMvc;
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-
-    protected byte[] toJsonWithId(Object entityView) throws JsonProcessingException {
-        return objectMapper.writeValueAsBytes(entityView);
-    }
-
-    protected byte[] toJsonWithoutId(Object entityView) throws JsonProcessingException {
-        VisibilityChecker<?> old = objectMapper.getVisibilityChecker();
-        objectMapper.setVisibility(new VisibilityChecker.Std(JsonAutoDetect.Visibility.DEFAULT) {
-            @Override
-            public boolean isGetterVisible(AnnotatedMethod m) {
-                return !m.hasAnnotation(IdMapping.class) && super.isGetterVisible(m);
-            }
-        });
-        byte[] result = objectMapper.writeValueAsBytes(entityView);
-        objectMapper.setVisibility(old);
-        return result;
-    }
-
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java
deleted file mode 100644
index b3d2b298ef..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc;
-
-import com.blazebit.persistence.integration.view.spring.EnableEntityViews;
-import com.blazebit.persistence.spring.data.repository.config.EnableBlazeRepositories;
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Document;
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Person;
-import com.blazebit.persistence.spring.hateoas.webmvc.tx.TransactionalWorkService;
-import org.hamcrest.Matcher;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@ContextConfiguration(classes = {DocumentControllerTest.TestConfig.class, HateoasAwareBlazePersistenceWebConfiguration.class})
-public class DocumentControllerTest extends AbstractSpringWebMvcTest {
-
-    @Autowired
-    private TransactionalWorkService transactionalWorkService;
-
-    @Test
-    public void testDocumentControllerHeaders() throws Exception {
-        // Given
-        Document d1 = createDocument("D1");
-        createDocument("D2");
-
-        // When / Then
-        mockMvc.perform(get("/documents?size=1").accept(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(header().stringValues(HttpHeaders.LINK, (Matcher<Iterable<String>>) (Matcher<?>) hasItem(containsString("{\"id\":" + d1.getId() + "}"))))
-                .andExpect(content().string(containsString("\"someInstant\"")));
-    }
-
-    @Test
-    public void testDocumentControllerHateoas() throws Exception {
-        // Given
-        Document d1 = createDocument("D1");
-        createDocument("D2");
-
-        // When / Then
-        mockMvc.perform(get("/documents?size=1").accept("application/hal+json"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.links[?(@.rel == 'next')].href", (Matcher<Iterable<String>>) (Matcher<?>) hasItem(containsString("{\"id\":" + d1.getId() + "}"))));
-    }
-
-    private Document createDocument(String name) {
-        return createDocument(name, null);
-    }
-
-    private Document createDocument(final String name, final Person owner) {
-        return createDocument(name, null, 0L, owner);
-    }
-
-    private Document createDocument(final String name, final String description, final long age, final Person owner) {
-        return transactionalWorkService.txGet((em, evm) -> {
-            Document d = new Document(name);
-            d.setDescription(description);
-            d.setAge(age);
-            d.setOwner(owner);
-            em.persist(d);
-            return d;
-        });
-    }
-
-    @Configuration
-    @ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*TestConfig"))
-    @ImportResource("classpath:/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml")
-    @EnableWebMvc
-    @EnableEntityViews(basePackages = "com.blazebit.persistence.spring.hateoas.webmvc.view")
-    @EnableBlazeRepositories(
-            basePackages = "com.blazebit.persistence.spring.hateoas.webmvc.repository",
-            entityManagerFactoryRef = "myEmf")
-    static class TestConfig {
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java
deleted file mode 100644
index 83f4ac3269..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.config;
-
-import com.blazebit.persistence.Criteria;
-import com.blazebit.persistence.CriteriaBuilderFactory;
-import com.blazebit.persistence.spi.CriteriaBuilderConfiguration;
-import com.blazebit.persistence.view.EntityViewManager;
-import com.blazebit.persistence.view.spi.EntityViewConfiguration;
-import com.blazebit.persistence.view.spi.type.TypeConverter;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
-
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.PersistenceUnit;
-import java.lang.reflect.Type;
-import java.util.UUID;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Configuration
-public class BlazePersistenceConfiguration {
-
-    @PersistenceUnit
-    private EntityManagerFactory entityManagerFactory;
-
-    @Bean
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
-    @Lazy(false)
-    public CriteriaBuilderFactory createCriteriaBuilderFactory() {
-        CriteriaBuilderConfiguration config = Criteria.getDefault();
-        return config.createCriteriaBuilderFactory(entityManagerFactory);
-    }
-
-    @Bean
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
-    @Lazy(false)
-    public EntityViewManager createEntityViewManager(CriteriaBuilderFactory cbf, EntityViewConfiguration entityViewConfiguration) {
-        entityViewConfiguration.registerTypeConverter(String.class, UUID.class, new TypeConverter<String, UUID>() {
-            @Override
-            public Class<?> getUnderlyingType(Class<?> owningClass, Type declaredType) {
-                return String.class;
-            }
-
-            @Override
-            public UUID convertToViewType(String object) {
-                return object == null ? null : UUID.fromString(object);
-            }
-
-            @Override
-            public String convertToUnderlyingType(UUID object) {
-                return object == null ? null : object.toString();
-            }
-        });
-        return entityViewConfiguration.createEntityViewManager(cbf);
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
deleted file mode 100644
index 19688bb14a..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.config;
-
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.PersistenceException;
-import java.util.Properties;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class CustomLocalContainerEntityManagerFactoryBean extends LocalContainerEntityManagerFactoryBean {
-
-    public static Properties properties;
-
-    @Override
-    protected EntityManagerFactory createNativeEntityManagerFactory() throws PersistenceException {
-        setJpaProperties(properties);
-        return super.createNativeEntityManagerFactory();
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java
deleted file mode 100644
index 5c757ce8b9..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.config;
-
-import org.springframework.test.context.support.DefaultActiveProfilesResolver;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public class SystemPropertyBasedActiveProfilesResolver extends DefaultActiveProfilesResolver {
-
-    private static final String ACTIVE_PROFILES_PROPERTY = "activeProfiles";
-    private static final String DEFAULT_ACTIVE_PROFILES = "hibernate";
-
-    @Override
-    public String[] resolve(Class<?> testClass) {
-        return System.getProperty(ACTIVE_PROFILES_PROPERTY, DEFAULT_ACTIVE_PROFILES).split(",");
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java
deleted file mode 100644
index 939b94d090..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.controller;
-
-import com.blazebit.persistence.spring.data.repository.KeysetPageable;
-import com.blazebit.persistence.spring.data.webmvc.KeysetConfig;
-import com.blazebit.persistence.spring.hateoas.webmvc.KeysetAwarePagedResourcesAssembler;
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Document;
-import com.blazebit.persistence.spring.hateoas.webmvc.repository.ReadOnlyDocumentViewRepository;
-import com.blazebit.persistence.spring.hateoas.webmvc.view.DocumentView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.IanaLinkRelations;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.PagedModel;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@RestController
-public class DocumentController {
-
-    private final ReadOnlyDocumentViewRepository readOnlyDocumentViewRepository;
-
-    @Autowired
-    public DocumentController(ReadOnlyDocumentViewRepository readOnlyDocumentViewRepository) {
-        this.readOnlyDocumentViewRepository = readOnlyDocumentViewRepository;
-    }
-
-    @GetMapping("/documents")
-    public HttpEntity<Page<DocumentView>> getDocuments(
-            @KeysetConfig(Document.class) @PageableDefault(sort = "id") KeysetPageable keysetPageable,
-            KeysetAwarePagedResourcesAssembler<DocumentView> assembler) {
-        Page<DocumentView> resultPage = readOnlyDocumentViewRepository.findAll(null, keysetPageable);
-
-        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-        for (Link link : assembler.toModel(resultPage).getLinks()) {
-            if (link.getRel() == IanaLinkRelations.FIRST || link.getRel() == IanaLinkRelations.PREV || link.getRel() == IanaLinkRelations.NEXT || link.getRel() == IanaLinkRelations.LAST) {
-                headers.add(HttpHeaders.LINK, link.toString());
-            }
-        }
-
-        return new HttpEntity<>(resultPage, headers);
-    }
-
-    @GetMapping(path = "/documents", produces = { "application/hal+json" })
-    public PagedModel<EntityModel<DocumentView>> getDocumentsHateoas(
-            @KeysetConfig(Document.class) @PageableDefault(sort = "id") KeysetPageable keysetPageable,
-            KeysetAwarePagedResourcesAssembler<DocumentView> assembler) {
-        return assembler.toModel(readOnlyDocumentViewRepository.findAll(null, keysetPageable));
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java
deleted file mode 100644
index 3435524b9d..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.entity;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import java.io.Serializable;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Entity
-public class Document implements Serializable {
-
-    private Long id;
-    private String name;
-    private String description;
-    private long age;
-    private Person owner;
-
-    public Document() {
-    }
-
-    public Document(String name) {
-        this.name = name;
-    }
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    public Person getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java
deleted file mode 100644
index 973efb6ee9..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.entity;
-
-import jakarta.persistence.Basic;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * @author Christian Beikov
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Entity
-public class Person implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-    private String name;
-    private long age;
-    private Set<Document> documents = new HashSet<>(0);
-
-    public Person() {
-        id = UUID.randomUUID().toString();
-    }
-
-    public Person(String name) {
-        this();
-        this.name = name;
-    }
-
-    @Id
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Basic(optional = false)
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getAge() {
-        return age;
-    }
-
-    public void setAge(long age) {
-        this.age = age;
-    }
-
-    @OneToMany(mappedBy = "owner")
-    public Set<Document> getDocuments() {
-        return documents;
-    }
-
-    public void setDocuments(Set<Document> documents) {
-        this.documents = documents;
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java
deleted file mode 100644
index 1e84272865..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.repository;
-
-import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
-import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
-import com.blazebit.persistence.spring.hateoas.webmvc.view.DocumentView;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Repository
-@Transactional(readOnly = true)
-public interface ReadOnlyDocumentViewRepository extends EntityViewRepository<DocumentView, Long>, EntityViewSpecificationExecutor<DocumentView, Long> {
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java
deleted file mode 100644
index e5f0b10689..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.tx;
-
-import com.blazebit.persistence.view.EntityViewManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import jakarta.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@Service
-@Transactional
-public class TransactionalWorkService {
-
-    @Autowired
-    private EntityManager em;
-    @Autowired
-    private EntityViewManager evm;
-
-    public <V> V txGet(TxWork<V> work) {
-        return work.work(em, evm);
-    }
-
-    public void doTxWork(TxVoidWork work) {
-        work.work(em, evm);
-    }
-
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java
deleted file mode 100644
index 0d2558a135..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.tx;
-
-import com.blazebit.persistence.view.EntityViewManager;
-
-import jakarta.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public interface TxVoidWork {
-
-    void work(EntityManager em, EntityViewManager evm);
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java
deleted file mode 100644
index f8e19a2f60..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.tx;
-
-import com.blazebit.persistence.view.EntityViewManager;
-
-import jakarta.persistence.EntityManager;
-
-/**
- * @author Moritz Becker
- * @author Eugen Mayer
- * @since 1.6.9
- */
-public interface TxWork<V> {
-
-    V work(EntityManager em, EntityViewManager evm);
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java
deleted file mode 100644
index 9fd317e52e..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.view;
-
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Document;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-import com.blazebit.persistence.view.Mapping;
-import com.blazebit.persistence.view.MappingParameter;
-
-import java.time.Instant;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@EntityView(Document.class)
-public interface DocumentView {
-
-    @IdMapping
-    Long getId();
-
-    String getName();
-
-    PersonView getOwner();
-
-    @Mapping("size(owner.documents)")
-    long getOwnerDocumentCount();
-
-    @MappingParameter("optionalParameter")
-    String getOptionalParameter();
-
-    default Instant getSomeInstant() {
-        return Instant.now();
-    }
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java b/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java
deleted file mode 100644
index b4eb0ab911..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.spring.hateoas.webmvc.view;
-
-import com.blazebit.persistence.spring.hateoas.webmvc.entity.Person;
-import com.blazebit.persistence.view.EntityView;
-import com.blazebit.persistence.view.IdMapping;
-
-import java.util.UUID;
-
-/**
- * @author Christian Beikov
- * @author Eugen Mayer
- * @since 1.6.9
- */
-@EntityView(Person.class)
-public interface PersonView {
-
-    @IdMapping
-    UUID getId();
-
-    String getName();
-
-}
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/META-INF/persistence.xml b/integration/spring-hateoas/webmvc-jakarta/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index e4bf334f34..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    <persistence-unit name="TestsuiteBase" transaction-type="RESOURCE_LOCAL">
-        <class>com.blazebit.persistence.spring.hateoas.webmvc.entity.Document</class>
-        <class>com.blazebit.persistence.spring.hateoas.webmvc.entity.Person</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml b/integration/spring-hateoas/webmvc-jakarta/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml
deleted file mode 100644
index 8a58c77488..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
-
-    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="myEmf"/>
-    </bean>
-
-    <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
-
-    <tx:annotation-driven />
-
-    <beans profile="hibernate">
-        <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
-
-        <bean id="myEmf" class="com.blazebit.persistence.spring.hateoas.webmvc.config.CustomLocalContainerEntityManagerFactoryBean">
-            <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
-            <property name="persistenceUnitName" value="TestsuiteBase"/>
-            <property name="jpaProperties">
-                <props>
-                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="hibernate.show_sql">false</prop>
-
-                    <!-- required for Hibernate 4.2 -->
-                    <prop key="hibernate.connection.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="hibernate.connection.username">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="hibernate.connection.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="hibernate.connection.driver_class">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="hibernate.hbm2ddl.auto">none</prop>
-                </props>
-            </property>
-        </bean>
-    </beans>
-
-    <beans profile="eclipselink">
-        <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter"/>
-
-        <bean id="myEmf" class="com.blazebit.persistence.spring.hateoas.webmvc.config.CustomLocalContainerEntityManagerFactoryBean">
-            <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
-            <property name="persistenceUnitName" value="TestsuiteBase"/>
-            <property name="loadTimeWeaver">
-                <bean class="org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver"/>
-            </property>
-            <property name="jpaProperties">
-                <props>
-                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
-                    <prop key="eclipselink.logging.level">OFF</prop> <!-- use FINE for debugging -->
-                </props>
-            </property>
-        </bean>
-    </beans>
-
-    <beans profile="datanucleus">
-        <bean id="myEmf" class="com.blazebit.persistence.spring.hateoas.webmvc.config.CustomLocalContainerEntityManagerFactoryBean">
-            <property name="persistenceProviderClass" value="org.datanucleus.api.jpa.PersistenceProviderImpl"/>
-            <property name="persistenceUnitName" value="TestsuiteBase"/>
-            <property name="jpaProperties">
-                <props>
-                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
-                </props>
-            </property>
-        </bean>
-    </beans>
-
-    <beans profile="openjpa">
-        <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"/>
-
-        <bean id="myEmf" class="com.blazebit.persistence.spring.hateoas.webmvc.config.CustomLocalContainerEntityManagerFactoryBean">
-            <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
-            <property name="persistenceUnitName" value="TestsuiteBase"/>
-            <property name="jpaProperties">
-                <props>
-                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
-                </props>
-            </property>
-        </bean>
-    </beans>
-</beans>
diff --git a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/logback-test.xml b/integration/spring-hateoas/webmvc-jakarta/src/test/resources/logback-test.xml
deleted file mode 100644
index aabcfdeeb6..0000000000
--- a/integration/spring-hateoas/webmvc-jakarta/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <logger name="org.springframework.core " level="error" />
-    <logger name="org.springframework.beans" level="error" />
-    <logger name="org.springframework.context" level="error" />
-    <logger name="org.springframework.transaction" level="error" />
-    <logger name="org.springframework.web" level="error" />
-    <logger name="org.springframework.test" level="error" />
-    <logger name="org.hibernate" level="error" />
-    <logger name="org.hibernate.SQL" level="debug" />
-</configuration>
\ No newline at end of file
diff --git a/integration/spring-hateoas/webmvc/pom.xml b/integration/spring-hateoas/webmvc/pom.xml
index 11b88e0809..6f04b1aaa0 100644
--- a/integration/spring-hateoas/webmvc/pom.xml
+++ b/integration/spring-hateoas/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-hateoas-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,13 +13,13 @@
 
     <properties>
         <module.name>com.blazebit.persistence.integration.spring.hateoas.webmvc</module.name>
-        <spring.activeProfiles />
         <test.argLine />
-        <version.spring />
-        <version.spring.boot />
-        <version.spring.data />
-        <version.spring.hateoas>1.0.2.RELEASE</version.spring.hateoas>
-        <main.java.version>1.8</main.java.version>
+        <version.spring>${version.spring-data-3.3-spring}</version.spring>
+        <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+        <version.spring-data>${version.spring-data-3.3}</version.spring-data>
+        <version.spring-hateoas>2.2.2</version.spring-hateoas>
+        <version.hibernate>${version.hibernate-6.6}</version.hibernate>
+        <main.java.version>17</main.java.version>
     </properties>
 
     <dependencyManagement>
@@ -36,21 +36,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${version.servlet}</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${version.servlet-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring.data}</version>
+            <version>${version.spring-data}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.hateoas</groupId>
             <artifactId>spring-hateoas</artifactId>
-            <version>${version.spring.hateoas}</version>
+            <version>${version.spring-hateoas}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -66,28 +71,20 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${version.spring.boot}</version>
+            <version>${version.spring-boot}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- At runtime the user is going to need all dependencies anyway, so let's just give them through transitively -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>
@@ -95,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -110,7 +107,6 @@
         </dependency>
 
         <!-- Test Dependencies -->
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -128,71 +124,59 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.hibernate-5.4}</version>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version.hibernate}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
+            <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${version.jaxb-api}</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>${version.activation-api}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>${version.jaxb}</version>
-            <scope>test</scope>
         </dependency>
         <!-- IntelliJ apparently needs the annotation processor here -->
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>${version.hibernate-5.4}</version>
+            <version>${version.hibernate}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        exports com.blazebit.persistence.spring.hateoas.webmvc;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2,</excludedGroups>
+                    <!-- Too complicated to make entities in test source open -->
+                    <useModulePath>false</useModulePath>
+                    <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoH2</excludedGroups>
                     <systemPropertyVariables>
                         <jdbc.url>jdbc:h2:mem:test</jdbc.url>
                         <jdbc.user>admin</jdbc.user>
@@ -210,234 +194,71 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <!-- source output directory -->
-                            <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                            <processors>
-                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <!-- Metamodel -->
-                    <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-jpamodelgen</artifactId>
-                        <version>${version.hibernate-5.4}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>${version.jaxb-api}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>${version.jaxb}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.transaction</groupId>
-                        <artifactId>jakarta.transaction-api</artifactId>
-                        <version>${version.jta}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                        <version>${version.activation}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/metamodel</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <!-- Metamodel -->
+                        <dependency>
+                            <groupId>org.hibernate.orm</groupId>
+                            <artifactId>hibernate-jpamodelgen</artifactId>
+                            <version>${version.hibernate}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${version.jaxb-api}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-impl</artifactId>
+                            <version>${version.jaxb}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.transaction</groupId>
+                            <artifactId>jakarta.transaction-api</artifactId>
+                            <version>${version.jta-api}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>${version.activation-api}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                    </annotationProcessors>
+                    <!-- ORM 6.2 still added the javax annotation -->
+                    <compilerArgs>
+                        <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                    </compilerArgs>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
     <profiles>
         <profile>
-            <id>spring-data-1.11.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.2}</version.spring.data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.0.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.2}</version.spring.data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.1.x</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.2}</version.spring.data>
+                <version.hibernate>${version.hibernate-6.2}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
         </profile>
         <profile>
-            <id>spring-data-2.2.x</id>
+            <id>hibernate-6.4</id>
             <properties>
-                <version.spring>${version.spring-data-2.2-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.2-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.2}</version.spring.data>
+                <version.hibernate>${version.hibernate-6.4}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
         </profile>
         <profile>
-            <id>spring-data-2.3.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.3-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.3-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.3}</version.spring.data>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.4.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.4-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.4-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.4}</version.spring.data>
-                <version.spring.hateoas>1.2.1</version.spring.hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.5.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.5-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.5-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.5}</version.spring.data>
-                <version.spring.hateoas>1.3.3</version.spring.hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.6.x</id>
-            <properties>
-                <version.spring>${version.spring-data-2.6-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.6-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.6}</version.spring.data>
-                <version.spring.hateoas>1.4.1</version.spring.hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>spring-data-2.7.x</id>
+            <id>hibernate-6.6</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.7}</version.spring.data>
-                <version.spring.hateoas>1.5.1</version.spring.hateoas>
+                <version.hibernate>${version.hibernate-6.6}</version.hibernate>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
         </profile>
         <profile>
-            <id>spring-data-3.1.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
-            <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.7}</version.spring.data>
-                <version.spring.hateoas>1.5.1</version.spring.hateoas>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.1 -->
+            <id>eclipselink</id>
             <build>
                 <plugins>
                     <plugin>
@@ -450,64 +271,62 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>hibernate-apt</id>
+            <properties>
+                <version.hibernate>${version.hibernate-apt}</version.hibernate>
+            </properties>
+        </profile>
+        <profile>
+            <id>spring-data-3.1.x</id>
+            <properties>
+                <version.spring>${version.spring-data-3.1-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.1-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.1}</version.spring-data>
+                <version.spring-hateoas>2.1.5</version.spring-hateoas>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>spring-data-3.2.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.7}</version.spring.data>
-                <version.spring.hateoas>1.5.1</version.spring.hateoas>
+                <version.spring>${version.spring-data-3.2-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.2-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.2}</version.spring-data>
+                <version.spring-hateoas>2.2.2</version.spring-hateoas>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.2 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>spring-data-3.3.x</id>
-            <!-- Default to compile this module with Spring Boot 2.7 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <version.spring>${version.spring-data-2.7-spring}</version.spring>
-                <version.spring.boot>${version.spring-data-2.7-spring-boot}</version.spring.boot>
-                <version.spring.data>${version.spring-data-2.7}</version.spring.data>
-                <version.spring.hateoas>1.5.1</version.spring.hateoas>
+                <version.spring>${version.spring-data-3.3-spring}</version.spring>
+                <version.spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-boot>
+                <version.spring-data>${version.spring-data-3.3}</version.spring-data>
+                <version.spring-hateoas>2.3.0</version.spring-hateoas>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                    <scope>test</scope>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
-            <!-- It makes no sense to run these tests with Spring Boot 3.3 -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
-
 </project>
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java
index cd7074df61..2f4118b3e6 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/BlazePersistenceAutoConfigurationImportFilter.java
@@ -12,7 +12,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Configuration
 public class BlazePersistenceAutoConfigurationImportFilter implements AutoConfigurationImportFilter {
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java
index 951cdc24f2..dcd961cb36 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasAwareBlazePersistenceWebConfiguration.java
@@ -25,7 +25,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Configuration
 public class HateoasAwareBlazePersistenceWebConfiguration extends BlazePersistenceWebConfiguration {
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java
index 1ece74a1ee..61e3efe132 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/HateoasKeysetPageableHandlerMethodArgumentResolver.java
@@ -17,7 +17,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class HateoasKeysetPageableHandlerMethodArgumentResolver extends KeysetPageableHandlerMethodArgumentResolver implements UriComponentsContributor {
 
@@ -81,7 +82,7 @@ public void enhance(UriComponentsBuilder builder, MethodParameter parameter, Obj
 
         // TODO: handle offset etc.
         builder.replaceQueryParam(pagePropertyName, isOneIndexedParameters() ? pageNumber + 1 : pageNumber);
-        builder.replaceQueryParam(sizePropertyName, pageable.getPageSize() <= getMaxPageSize() ? pageable.getPageSize() : getMaxPageSize());
+        builder.replaceQueryParam(sizePropertyName, Math.min(pageable.getPageSize(), getMaxPageSize()));
 
         ((HateoasSortHandlerMethodArgumentResolver) getSortResolver()).enhance(builder, parameter, pageable.getSort());
     }
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java
index 4c7c85f1e3..c2d78c795e 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwareMethodParameterAwarePagedResourcesAssembler.java
@@ -12,7 +12,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 class KeysetAwareMethodParameterAwarePagedResourcesAssembler<T> extends KeysetAwarePagedResourcesAssembler<T> {
 
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java
index 38273efb33..6ce4609b67 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssembler.java
@@ -45,7 +45,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class KeysetAwarePagedResourcesAssembler<T> implements RepresentationModelAssembler<Page<T>, PagedModel<EntityModel<T>>> {
 
diff --git a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java
index 7638069494..278f537dbd 100644
--- a/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java
+++ b/integration/spring-hateoas/webmvc/src/main/java/com/blazebit/persistence/spring/hateoas/webmvc/KeysetAwarePagedResourcesAssemblerArgumentResolver.java
@@ -28,7 +28,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class KeysetAwarePagedResourcesAssemblerArgumentResolver implements HandlerMethodArgumentResolver {
 
diff --git a/integration/spring-hateoas/webmvc/src/main/java/module-info.java b/integration/spring-hateoas/webmvc/src/main/java/module-info.java
new file mode 100644
index 0000000000..ed1b361756
--- /dev/null
+++ b/integration/spring-hateoas/webmvc/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.integration.spring.hateoas.webmvc {
+	requires com.blazebit.persistence.integration.spring.data.webmvc;
+	requires spring.boot.autoconfigure;
+	requires com.blazebit.persistence.view;
+	requires com.fasterxml.jackson.databind;
+	requires spring.beans;
+	requires spring.core;
+	requires spring.data.commons;
+	requires spring.hateoas;
+	requires spring.web;
+	requires org.slf4j;
+	exports com.blazebit.persistence.spring.hateoas.webmvc;
+}
\ No newline at end of file
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java
index df934df0fd..e6fbc26ebb 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringTest.java
@@ -21,7 +21,8 @@
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @ActiveProfiles(resolver = SystemPropertyBasedActiveProfilesResolver.class)
 public abstract class AbstractSpringTest extends AbstractPersistenceTest {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java
index 7e568496a6..eba0c571c7 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/AbstractSpringWebMvcTest.java
@@ -20,7 +20,8 @@
 
 /**
  * @author Moritz Becker
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @WebAppConfiguration
 public abstract class AbstractSpringWebMvcTest extends AbstractSpringTest {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java
index bdbfbb607f..b3d2b298ef 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/DocumentControllerTest.java
@@ -29,7 +29,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @ContextConfiguration(classes = {DocumentControllerTest.TestConfig.class, HateoasAwareBlazePersistenceWebConfiguration.class})
 public class DocumentControllerTest extends AbstractSpringWebMvcTest {
@@ -41,7 +42,7 @@ public class DocumentControllerTest extends AbstractSpringWebMvcTest {
     public void testDocumentControllerHeaders() throws Exception {
         // Given
         Document d1 = createDocument("D1");
-        Document d2 = createDocument("D2");
+        createDocument("D2");
 
         // When / Then
         mockMvc.perform(get("/documents?size=1").accept(MediaType.APPLICATION_JSON))
@@ -54,7 +55,7 @@ public void testDocumentControllerHeaders() throws Exception {
     public void testDocumentControllerHateoas() throws Exception {
         // Given
         Document d1 = createDocument("D1");
-        Document d2 = createDocument("D2");
+        createDocument("D2");
 
         // When / Then
         mockMvc.perform(get("/documents?size=1").accept("application/hal+json"))
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java
index 57dd2e24f5..83f4ac3269 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/BlazePersistenceConfiguration.java
@@ -17,14 +17,15 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Configuration
 public class BlazePersistenceConfiguration {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
index 8b480a56b5..19688bb14a 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/CustomLocalContainerEntityManagerFactoryBean.java
@@ -7,13 +7,14 @@
 
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
 import java.util.Properties;
 
 /**
  * @author Moritz Becker
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class CustomLocalContainerEntityManagerFactoryBean extends LocalContainerEntityManagerFactoryBean {
 
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java
index 5fa9d1873d..5c757ce8b9 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/config/SystemPropertyBasedActiveProfilesResolver.java
@@ -9,7 +9,8 @@
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public class SystemPropertyBasedActiveProfilesResolver extends DefaultActiveProfilesResolver {
 
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java
index 6f55f610f5..939b94d090 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/controller/DocumentController.java
@@ -27,7 +27,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @RestController
 public class DocumentController {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java
index 9abb527a68..3435524b9d 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Document.java
@@ -5,16 +5,17 @@
 
 package com.blazebit.persistence.spring.hateoas.webmvc.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
 /**
  * @author Moritz Becker
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Entity
 public class Document implements Serializable {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java
index 89d4adbce8..973efb6ee9 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/entity/Person.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.spring.hateoas.webmvc.entity;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -17,7 +17,8 @@
 /**
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Entity
 public class Person implements Serializable {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java
index 0aa26e8f73..1e84272865 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/repository/ReadOnlyDocumentViewRepository.java
@@ -13,7 +13,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Repository
 @Transactional(readOnly = true)
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java
index dc36df59e2..e5f0b10689 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TransactionalWorkService.java
@@ -10,11 +10,12 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @Service
 @Transactional
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java
index 3c5ad8ed5c..0d2558a135 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxVoidWork.java
@@ -7,11 +7,12 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public interface TxVoidWork {
 
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java
index dcad8108b5..f8e19a2f60 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/tx/TxWork.java
@@ -7,11 +7,12 @@
 
 import com.blazebit.persistence.view.EntityViewManager;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * @author Moritz Becker
- * @since 1.2.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 public interface TxWork<V> {
 
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java
index ff4d6ba101..9fd317e52e 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/DocumentView.java
@@ -15,7 +15,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @EntityView(Document.class)
 public interface DocumentView {
diff --git a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java
index 253abc95e0..b4eb0ab911 100644
--- a/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java
+++ b/integration/spring-hateoas/webmvc/src/test/java/com/blazebit/persistence/spring/hateoas/webmvc/view/PersonView.java
@@ -13,7 +13,8 @@
 
 /**
  * @author Christian Beikov
- * @since 1.5.0
+ * @author Eugen Mayer
+ * @since 1.6.9
  */
 @EntityView(Person.class)
 public interface PersonView {
diff --git a/integration/spring-hateoas/webmvc/src/test/resources/META-INF/persistence.xml b/integration/spring-hateoas/webmvc/src/test/resources/META-INF/persistence.xml
index 28636bc78b..e4bf334f34 100644
--- a/integration/spring-hateoas/webmvc/src/test/resources/META-INF/persistence.xml
+++ b/integration/spring-hateoas/webmvc/src/test/resources/META-INF/persistence.xml
@@ -10,7 +10,7 @@
         <class>com.blazebit.persistence.spring.hateoas.webmvc.entity.Person</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integration/spring-hateoas/webmvc/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml b/integration/spring-hateoas/webmvc/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml
index 398c605184..8a58c77488 100644
--- a/integration/spring-hateoas/webmvc/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml
+++ b/integration/spring-hateoas/webmvc/src/test/resources/com/blazebit/persistence/spring/hateoas/webmvc/application-config.xml
@@ -26,10 +26,10 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
                     <prop key="hibernate.show_sql">false</prop>
 
                     <!-- required for Hibernate 4.2 -->
@@ -54,11 +54,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             </property>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                     <prop key="eclipselink.logging.level">OFF</prop> <!-- use FINE for debugging -->
                 </props>
             </property>
@@ -71,11 +71,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
@@ -89,13 +89,13 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
             <property name="persistenceUnitName" value="TestsuiteBase"/>
             <property name="jpaProperties">
                 <props>
-                    <prop key="javax.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
-                    <prop key="javax.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
-                    <prop key="javax.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
-                    <prop key="javax.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
-                    <prop key="javax.persistence.schema-generation.database.action">NONE</prop>
+                    <prop key="jakarta.persistence.jdbc.url">#{systemProperties['jdbc.url']}</prop>
+                    <prop key="jakarta.persistence.jdbc.user">#{systemProperties['jdbc.user']}</prop>
+                    <prop key="jakarta.persistence.jdbc.password">#{systemProperties['jdbc.password']}</prop>
+                    <prop key="jakarta.persistence.jdbc.driver">#{systemProperties['jdbc.driver']}</prop>
+                    <prop key="jakarta.persistence.schema-generation.database.action">NONE</prop>
                 </props>
             </property>
         </bean>
     </beans>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/integration/spring-hateoas/webmvc/src/test/resources/logback-test.xml b/integration/spring-hateoas/webmvc/src/test/resources/logback-test.xml
index 0f318994b6..aabcfdeeb6 100644
--- a/integration/spring-hateoas/webmvc/src/test/resources/logback-test.xml
+++ b/integration/spring-hateoas/webmvc/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
     <logger name="org.springframework.web" level="error" />
     <logger name="org.springframework.test" level="error" />
     <logger name="org.hibernate" level="error" />
-<!--    <logger name="org.hibernate.SQL" level="debug" />-->
+    <logger name="org.hibernate.SQL" level="debug" />
 </configuration>
\ No newline at end of file
diff --git a/jpa-criteria/api-jakarta/pom.xml b/jpa-criteria/api-jakarta/pom.xml
deleted file mode 100644
index e0cedf300f..0000000000
--- a/jpa-criteria/api-jakarta/pom.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-jpa-criteria-api:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-api:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-api:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/api-jar/pom.xml b/jpa-criteria/api-jar/pom.xml
deleted file mode 100644
index 3cf48dfbad..0000000000
--- a/jpa-criteria/api-jar/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-api-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility-jar</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-jpa-criteria-api</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/api/pom.xml b/jpa-criteria/api/pom.xml
index d0bfa39e23..1e42099c7e 100644
--- a/jpa-criteria/api/pom.xml
+++ b/jpa-criteria/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,46 +28,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
 
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires transitive com.blazebit.persistence.core;
-                                        exports com.blazebit.persistence.criteria;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAbstractQuery.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAbstractQuery.java
index 0251039284..3fa90a1d94 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAbstractQuery.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAbstractQuery.java
@@ -5,15 +5,15 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.AbstractQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.criteria.AbstractQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.List;
 import java.util.Set;
 
 /**
- * An extended version of {@link AbstractQuery} that allows setting an alias for {@link javax.persistence.criteria.From} elements.
+ * An extended version of {@link AbstractQuery} that allows setting an alias for {@link jakarta.persistence.criteria.From} elements.
  *
  * @param <T> the type of the result
  * @author Christian Beikov
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAggregateFunctionExpression.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAggregateFunctionExpression.java
index 811fc9f436..4ea9c077b1 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAggregateFunctionExpression.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeAggregateFunctionExpression.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate;
 
 /**
- * An {@link javax.persistence.criteria.Expression} for an aggregate function.
+ * An {@link jakarta.persistence.criteria.Expression} for an aggregate function.
  *
  * @param <X> The target type
  * @author Christian Beikov
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCollectionJoin.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCollectionJoin.java
index d65f78406b..03e08db257 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCollectionJoin.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCollectionJoin.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An extended version of {@link CollectionJoin}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCommonAbstractCriteria.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCommonAbstractCriteria.java
index 5fd585da56..a49d8325ef 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCommonAbstractCriteria.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCommonAbstractCriteria.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.CommonAbstractCriteria;
+import jakarta.persistence.criteria.CommonAbstractCriteria;
 
 /**
  * An extended version of {@link CommonAbstractCriteria}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaBuilder.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaBuilder.java
index ee27eabc32..ae8f2f64fc 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaBuilder.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaBuilder.java
@@ -5,17 +5,17 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.Tuple;
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
 import java.util.Map;
 
 /**
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaDelete.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaDelete.java
index 5672ed9f0e..9641a58352 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaDelete.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaDelete.java
@@ -7,11 +7,11 @@
 
 import com.blazebit.persistence.DeleteCriteriaBuilder;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  * An extended version of {@link CriteriaDelete}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaQuery.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaQuery.java
index c499ee533d..0c360f4b6d 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaQuery.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaQuery.java
@@ -7,12 +7,12 @@
 
 import com.blazebit.persistence.CriteriaBuilder;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Selection;
 import java.util.List;
 
 /**
@@ -33,9 +33,9 @@ public interface BlazeCriteriaQuery<T> extends CriteriaQuery<T>, BlazeAbstractQu
     public CriteriaBuilder<T> createCriteriaBuilder(EntityManager entityManager);
 
     /**
-     * The extended JPA {@link javax.persistence.criteria.CriteriaBuilder} associated with this query.
+     * The extended JPA {@link jakarta.persistence.criteria.CriteriaBuilder} associated with this query.
      *
-     * @return The JPA {@link javax.persistence.criteria.CriteriaBuilder}
+     * @return The JPA {@link jakarta.persistence.criteria.CriteriaBuilder}
      */
     public BlazeCriteriaBuilder getCriteriaBuilder();
 
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaUpdate.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaUpdate.java
index 0f8b14b8af..6efbbee837 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaUpdate.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeCriteriaUpdate.java
@@ -7,13 +7,13 @@
 
 import com.blazebit.persistence.UpdateCriteriaBuilder;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
  * An extended version of {@link CriteriaUpdate}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeExpression.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeExpression.java
index bb6816839e..3fdc3807a4 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeExpression.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeExpression.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * An extended version of {@link Expression}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetch.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetch.java
index 04711f0130..d9563cf2cc 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetch.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetch.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Fetch;
+import jakarta.persistence.criteria.Fetch;
 
 /**
  * An extended version of {@link Fetch}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetchParent.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetchParent.java
index 4366c83e87..9ce377aaeb 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetchParent.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFetchParent.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.FetchParent;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.FetchParent;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
  * An extended version of {@link FetchParent}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFrom.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFrom.java
index 62aa46645c..f0625bf3f2 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFrom.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFrom.java
@@ -5,14 +5,14 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Set;
 
 /**
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFunctionExpression.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFunctionExpression.java
index ca29bf342e..8eaf39e5c3 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFunctionExpression.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeFunctionExpression.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.criteria;
 
 /**
- * An {@link javax.persistence.criteria.Expression} for a function.
+ * An {@link jakarta.persistence.criteria.Expression} for a function.
  *
  * @param <X> The target type
  * @author Christian Beikov
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeJoin.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeJoin.java
index 6fa13611f8..c3609d2134 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeJoin.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeJoin.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Fetch;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Fetch;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An extended version of {@link Join}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeListJoin.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeListJoin.java
index 82273e8d4e..0259023e72 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeListJoin.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeListJoin.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An extended version of {@link ListJoin}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeMapJoin.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeMapJoin.java
index 155304125f..9faad4dd8b 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeMapJoin.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeMapJoin.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An extended version of {@link MapJoin}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrder.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrder.java
index 5d188145f8..1eb7503fbd 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrder.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrder.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Order;
+import jakarta.persistence.criteria.Order;
 
 /**
  * An extended version of {@link Order}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrderedSetAggregateFunctionExpression.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrderedSetAggregateFunctionExpression.java
index 5fd59efc1b..81c0fce53f 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrderedSetAggregateFunctionExpression.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeOrderedSetAggregateFunctionExpression.java
@@ -5,12 +5,12 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
 import java.util.List;
 
 /**
- * An {@link javax.persistence.criteria.Expression} for an ordered set-aggregate function.
+ * An {@link jakarta.persistence.criteria.Expression} for an ordered set-aggregate function.
  *
  * @param <X> The target type
  * @author Christian Beikov
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazePath.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazePath.java
index 8f2d1a5d41..c95da775ec 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazePath.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazePath.java
@@ -5,10 +5,10 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Path;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
  * An extended version of {@link Path}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeRoot.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeRoot.java
index ba54e36eab..786bdf85f9 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeRoot.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeRoot.java
@@ -5,7 +5,7 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 /**
  * An extended version of {@link Root}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSetJoin.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSetJoin.java
index 8004dbe04c..2c3a05107c 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSetJoin.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSetJoin.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.SetJoin;
 
 /**
  * An extended version of {@link SetJoin}.
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSubquery.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSubquery.java
index b60052efe4..d8e267cb4e 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSubquery.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeSubquery.java
@@ -5,18 +5,18 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.criteria.Subquery;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Subquery;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.List;
 import java.util.Set;
 
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindow.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindow.java
index 5dc4218376..6770b1ca0f 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindow.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindow.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.criteria;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Order;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Order;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindowFunctionExpression.java b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindowFunctionExpression.java
index 5872b7671a..4922d9c984 100644
--- a/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindowFunctionExpression.java
+++ b/jpa-criteria/api/src/main/java/com/blazebit/persistence/criteria/BlazeWindowFunctionExpression.java
@@ -6,7 +6,7 @@
 package com.blazebit.persistence.criteria;
 
 /**
- * An {@link javax.persistence.criteria.Expression} for a window enabled function.
+ * An {@link jakarta.persistence.criteria.Expression} for a window enabled function.
  *
  * @param <X> The target type
  * @author Christian Beikov
diff --git a/jpa-criteria/api/src/main/java/module-info.java b/jpa-criteria/api/src/main/java/module-info.java
new file mode 100644
index 0000000000..cd1f1ee79c
--- /dev/null
+++ b/jpa-criteria/api/src/main/java/module-info.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.criteria {
+	requires transitive com.blazebit.persistence.core;
+	requires jakarta.persistence;
+	exports com.blazebit.persistence.criteria;
+	exports com.blazebit.persistence.criteria.spi;
+}
\ No newline at end of file
diff --git a/jpa-criteria/impl-jakarta/pom.xml b/jpa-criteria/impl-jakarta/pom.xml
deleted file mode 100644
index 78bb5edac2..0000000000
--- a/jpa-criteria/impl-jakarta/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-jpa-criteria-impl:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-impl:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-impl:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/impl-jar/pom.xml b/jpa-criteria/impl-jar/pom.xml
deleted file mode 100644
index 5cb8092cc4..0000000000
--- a/jpa-criteria/impl-jar/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-impl-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.impl</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-parser-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-jpa-criteria-impl</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/impl/pom.xml b/jpa-criteria/impl/pom.xml
index 9a511a2234..30a9519cd1 100644
--- a/jpa-criteria/impl/pom.xml
+++ b/jpa-criteria/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -38,21 +38,8 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-apt-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-            <version>${project.version}</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -60,69 +47,19 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>target/generated/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>target/generated/resources</outputDirectory>
-                            <processors>
-                                <!-- list of processors to use -->
-                                <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <module>
-                                <moduleInfoSource>
-                                    module ${module.name} {
-                                        requires com.blazebit.common.utils;
-                                        requires transitive com.blazebit.persistence.criteria;
-                                        exports com.blazebit.persistence.criteria.impl;
-                                        provides com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory with com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderFactoryImpl;
-                                    }
-                                </moduleInfoSource>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <dependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>blaze-apt-utils</artifactId>
+                            <version>${version.blazeutils}</version>
+                        </dependency>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <processor>com.blazebit.apt.service.ServiceProviderAnnotationProcessor</processor>
+                    </annotationProcessors>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/AbstractModificationCriteriaQuery.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/AbstractModificationCriteriaQuery.java
index 8c6c81aa44..8bffa31e9a 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/AbstractModificationCriteriaQuery.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/AbstractModificationCriteriaQuery.java
@@ -14,9 +14,9 @@
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 import com.blazebit.persistence.criteria.impl.path.RootImpl;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderFactoryImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderFactoryImpl.java
index 72012db12a..215385936a 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderFactoryImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderFactoryImpl.java
@@ -5,7 +5,6 @@
 
 package com.blazebit.persistence.criteria.impl;
 
-import com.blazebit.apt.service.ServiceProvider;
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
 import com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory;
@@ -14,7 +13,6 @@
  * @author Christian Beikov
  * @since 1.2.1
  */
-@ServiceProvider(BlazeCriteriaBuilderFactory.class)
 public class BlazeCriteriaBuilderFactoryImpl implements BlazeCriteriaBuilderFactory {
 
     @Override
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderImpl.java
index b915ffb06b..8bf601f57f 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaBuilderImpl.java
@@ -56,6 +56,9 @@
 import com.blazebit.persistence.criteria.impl.expression.function.CurrentTimeFunction;
 import com.blazebit.persistence.criteria.impl.expression.function.CurrentTimestampFunction;
 import com.blazebit.persistence.criteria.impl.expression.function.FunctionExpressionImpl;
+import com.blazebit.persistence.criteria.impl.expression.function.LocalDateFunction;
+import com.blazebit.persistence.criteria.impl.expression.function.LocalDateTimeFunction;
+import com.blazebit.persistence.criteria.impl.expression.function.LocalTimeFunction;
 import com.blazebit.persistence.criteria.impl.expression.function.LocateFunction;
 import com.blazebit.persistence.criteria.impl.expression.function.NullifFunction;
 import com.blazebit.persistence.criteria.impl.expression.function.OrderedSetAggregationFunction;
@@ -74,24 +77,27 @@
 import com.blazebit.persistence.criteria.impl.support.CriteriaBuilderSupport;
 import com.blazebit.persistence.parser.EntityMetamodel;
 
-import javax.persistence.Tuple;
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.CompoundSelection;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Predicate.BooleanOperator;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Selection;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.CompoundSelection;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate.BooleanOperator;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Subquery;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -681,6 +687,46 @@ public Expression<Double> sqrt(Expression<? extends Number> expression) {
         return new FunctionExpressionImpl<>(this, Double.class, "SQRT", expression);
     }
 
+    @Override
+    public Expression<Integer> sign(Expression<? extends Number> x) {
+        return new FunctionExpressionImpl<>(this, Integer.class, "SIGN", x);
+    }
+
+    @Override
+    public <N extends Number> Expression<N> ceiling(Expression<N> x) {
+        return new FunctionExpressionImpl<>(this, (Class<N>) x.getJavaType(), "CEILING", x);
+    }
+
+    @Override
+    public <N extends Number> Expression<N> floor(Expression<N> x) {
+        return new FunctionExpressionImpl<>(this, (Class<N>) x.getJavaType(), "FLOOR", x);
+    }
+
+    @Override
+    public Expression<Double> exp(Expression<? extends Number> x) {
+        return new FunctionExpressionImpl<>(this, Double.class, "EXP", x);
+    }
+
+    @Override
+    public Expression<Double> ln(Expression<? extends Number> x) {
+        return new FunctionExpressionImpl<>(this, Double.class, "LN", x);
+    }
+
+    @Override
+    public Expression<Double> power(Expression<? extends Number> x, Expression<? extends Number> y) {
+        return new FunctionExpressionImpl<>(this, Double.class, "POWER", x, y);
+    }
+
+    @Override
+    public Expression<Double> power(Expression<? extends Number> x, Number y) {
+        return new FunctionExpressionImpl<>(this, Double.class, "POWER", x, value(y));
+    }
+
+    @Override
+    public <T extends Number> Expression<T> round(Expression<T> x, Integer n) {
+        return new FunctionExpressionImpl<>(this, (Class<T>) x.getJavaType(), "ROUND", x, value(n));
+    }
+
     @Override
     public Expression<java.sql.Date> currentDate() {
         return new CurrentDateFunction(this);
@@ -696,6 +742,21 @@ public Expression<java.sql.Time> currentTime() {
         return new CurrentTimeFunction(this);
     }
 
+    @Override
+    public Expression<LocalDate> localDate() {
+        return new LocalDateFunction(this);
+    }
+
+    @Override
+    public Expression<LocalDateTime> localDateTime() {
+        return new LocalDateTimeFunction(this);
+    }
+
+    @Override
+    public Expression<LocalTime> localTime() {
+        return new LocalTimeFunction(this);
+    }
+
     @Override
     public Expression<String> substring(Expression<String> value, Expression<Integer> start) {
         return new SubstringFunction(this, value, start);
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaDeleteImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaDeleteImpl.java
index c7330acc3c..355247d653 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaDeleteImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaDeleteImpl.java
@@ -8,10 +8,10 @@
 import com.blazebit.persistence.DeleteCriteriaBuilder;
 import com.blazebit.persistence.criteria.BlazeCriteriaDelete;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Predicate;
 import java.util.Map;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaQueryImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaQueryImpl.java
index 312be88c21..cf33a8fd5b 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaQueryImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaQueryImpl.java
@@ -12,15 +12,15 @@
 import com.blazebit.persistence.criteria.BlazeRoot;
 import com.blazebit.persistence.criteria.BlazeSubquery;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Selection;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.EntityType;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaUpdateImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaUpdateImpl.java
index 057134d73a..d386b2a285 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaUpdateImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeCriteriaUpdateImpl.java
@@ -13,12 +13,12 @@
 import com.blazebit.persistence.criteria.impl.path.AbstractPath;
 import com.blazebit.persistence.criteria.impl.path.SingularAttributePath;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeWindowImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeWindowImpl.java
index b8a3bb580a..5e2ce1f1bc 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeWindowImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/BlazeWindowImpl.java
@@ -16,8 +16,8 @@
 import com.blazebit.persistence.parser.expression.WindowFrameExclusionType;
 import com.blazebit.persistence.parser.expression.WindowFramePositionType;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Order;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Order;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/InternalQuery.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/InternalQuery.java
index 62ac49da51..0d9ee3893d 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/InternalQuery.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/InternalQuery.java
@@ -34,17 +34,17 @@
 import com.blazebit.persistence.criteria.impl.path.RootImpl;
 import com.blazebit.persistence.criteria.impl.path.TreatedPath;
 
-import javax.persistence.Tuple;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Selection;
-import javax.persistence.criteria.Subquery;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.criteria.Subquery;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -615,7 +615,7 @@ private String getPath(String parentPath, BlazeJoin<?, ?> j, EntityType<?> treat
         }
     }
 
-    private JoinType getJoinType(javax.persistence.criteria.JoinType joinType) {
+    private JoinType getJoinType(jakarta.persistence.criteria.JoinType joinType) {
         switch (joinType) {
             case INNER:
                 return JoinType.INNER;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/JpaTupleObjectBuilder.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/JpaTupleObjectBuilder.java
index 28c7eb6f37..b213d53f08 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/JpaTupleObjectBuilder.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/JpaTupleObjectBuilder.java
@@ -9,9 +9,9 @@
 import com.blazebit.persistence.SelectBuilder;
 import com.blazebit.persistence.parser.util.TypeUtils;
 
-import javax.persistence.Tuple;
-import javax.persistence.TupleElement;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TupleElement;
+import jakarta.persistence.criteria.Selection;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/OrderImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/OrderImpl.java
index 66a9d7ed1f..db6181a065 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/OrderImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/OrderImpl.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.criteria.BlazeOrder;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/ParameterVisitor.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/ParameterVisitor.java
index 0c3f210773..fab66a4378 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/ParameterVisitor.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/ParameterVisitor.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.criteria.impl.expression.AbstractSelection;
 
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Selection;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContext.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContext.java
index 2c5f91d2b3..a824e4eb5c 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContext.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContext.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.SubqueryInitiator;
 
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Selection;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContextImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContextImpl.java
index fcd93488fe..d0bf74466b 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContextImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/RenderContextImpl.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.SubqueryInitiator;
 import com.blazebit.persistence.criteria.impl.expression.AbstractSelection;
 
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Selection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractExpression.java
index 04607b7fa4..c82dce14df 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractExpression.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 import com.blazebit.persistence.criteria.impl.expression.function.FunctionExpressionImpl;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Date;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractPredicate.java
index 2fc5c1dc88..3bfc066616 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractPredicate.java
@@ -7,8 +7,8 @@
 
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Selection;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSelection.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSelection.java
index 70f2feb707..c4fe43d315 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSelection.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSelection.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.Selection;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSimplePredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSimplePredicate.java
index 93e1d582cb..6217805036 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSimplePredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractSimplePredicate.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractTupleElement.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractTupleElement.java
index 07762800f6..f1e5bb5970 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractTupleElement.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/AbstractTupleElement.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.parser.util.TypeConverter;
 import com.blazebit.persistence.parser.util.TypeUtils;
 
-import javax.persistence.TupleElement;
+import jakarta.persistence.TupleElement;
 import java.io.Serializable;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BetweenPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BetweenPredicate.java
index 296e3e6fdf..95915bcc57 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BetweenPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BetweenPredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BinaryArithmeticExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BinaryArithmeticExpression.java
index 25ae532087..6df5ed5ad8 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BinaryArithmeticExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BinaryArithmeticExpression.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BooleanExpressionPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BooleanExpressionPredicate.java
index 08a47ad037..1b54e3c6bd 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BooleanExpressionPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/BooleanExpressionPredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ComparisonPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ComparisonPredicate.java
index 93202c8e5a..885cfbbe71 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ComparisonPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ComparisonPredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundPredicate.java
index 4700b8bb33..a9a57955d5 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundPredicate.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundSelectionImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundSelectionImpl.java
index 8e5e181f0c..9cb9b7e82f 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundSelectionImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/CompoundSelectionImpl.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.CompoundSelection;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.CompoundSelection;
+import jakarta.persistence.criteria.Selection;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ExistsPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ExistsPredicate.java
index e512177cd7..6eca66e7a8 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ExistsPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ExistsPredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/GeneralCaseExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/GeneralCaseExpression.java
index df88894956..408829af17 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/GeneralCaseExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/GeneralCaseExpression.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.CriteriaBuilder.Case;
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.CriteriaBuilder.Case;
+import jakarta.persistence.criteria.Expression;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/InPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/InPredicate.java
index d7e1c2df93..9b9516f21d 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/InPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/InPredicate.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Subquery;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/IsNullPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/IsNullPredicate.java
index ea7bd805f3..ca7aa6e73e 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/IsNullPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/IsNullPredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/LikePredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/LikePredicate.java
index 5821d1c63d..92574bb3c3 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/LikePredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/LikePredicate.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/MemberOfPredicate.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/MemberOfPredicate.java
index f32a53d3b2..8a729bbf99 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/MemberOfPredicate.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/MemberOfPredicate.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.path.PluralAttributePath;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.util.Collection;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ParameterExpressionImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ParameterExpressionImpl.java
index 13911d0a2d..dae2c37f59 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ParameterExpressionImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/ParameterExpressionImpl.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.Parameter;
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.criteria.ParameterExpression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/QuantifiableSubqueryExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/QuantifiableSubqueryExpression.java
index d192b09f1a..c6529a7779 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/QuantifiableSubqueryExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/QuantifiableSubqueryExpression.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.io.Serializable;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SimpleCaseExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SimpleCaseExpression.java
index bd464481d6..5188a16054 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SimpleCaseExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SimpleCaseExpression.java
@@ -5,12 +5,13 @@
 
 package com.blazebit.persistence.criteria.impl.expression;
 
+import com.blazebit.persistence.criteria.BlazeExpression;
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.CriteriaBuilder.SimpleCase;
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.CriteriaBuilder.SimpleCase;
+import jakarta.persistence.criteria.Expression;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -73,6 +74,25 @@ public SimpleCase<C, R> when(C condition, Expression<? extends R> result) {
         return this;
     }
 
+    @Override
+    public SimpleCase<C, R> when(Expression<? extends C> condition, R result) {
+        BlazeExpression<R> resultExpression = criteriaBuilder.value(result);
+        //noinspection unchecked
+        WhenClause whenClause = new WhenClause((Expression<C>) condition, resultExpression);
+        whenClauses.add(whenClause);
+        adjustJavaType(resultExpression);
+        return this;
+    }
+
+    @Override
+    public SimpleCase<C, R> when(Expression<? extends C> condition, Expression<? extends R> result) {
+        //noinspection unchecked
+        WhenClause whenClause = new WhenClause((Expression<C>) condition, result);
+        whenClauses.add(whenClause);
+        adjustJavaType(result);
+        return this;
+    }
+
     @SuppressWarnings({"unchecked"})
     private void adjustJavaType(Expression<? extends R> exp) {
         if (javaType == null) {
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SubqueryExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SubqueryExpression.java
index f297b32212..798929e718 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SubqueryExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/SubqueryExpression.java
@@ -27,17 +27,17 @@
 import com.blazebit.persistence.criteria.impl.path.SetAttributeJoin;
 import com.blazebit.persistence.criteria.impl.support.SubquerySupport;
 
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
+import jakarta.persistence.metamodel.EntityType;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/UnaryMinusExpression.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/UnaryMinusExpression.java
index 4b0a332990..eb29d92239 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/UnaryMinusExpression.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/UnaryMinusExpression.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/AggregationFunctionExpressionImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/AggregationFunctionExpressionImpl.java
index a217c1ecdd..c3140457fb 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/AggregationFunctionExpressionImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/AggregationFunctionExpressionImpl.java
@@ -13,8 +13,8 @@
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 import com.blazebit.persistence.criteria.impl.expression.AbstractSelection;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/CoalesceFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/CoalesceFunction.java
index 47bcf34cf2..76ac2441e2 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/CoalesceFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/CoalesceFunction.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 
-import javax.persistence.criteria.CriteriaBuilder.Coalesce;
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.CriteriaBuilder.Coalesce;
+import jakarta.persistence.criteria.Expression;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/ConcatFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/ConcatFunction.java
index 3c24ce01af..7dacb59f10 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/ConcatFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/ConcatFunction.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/EntryFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/EntryFunction.java
index 520711363b..7838722527 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/EntryFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/EntryFunction.java
@@ -13,7 +13,7 @@
 import com.blazebit.persistence.criteria.impl.path.AbstractPath;
 import com.blazebit.persistence.criteria.impl.path.TreatedPath;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.util.Map;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/FunctionExpressionImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/FunctionExpressionImpl.java
index 99babebb80..3d6273c096 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/FunctionExpressionImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/FunctionExpressionImpl.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateFunction.java
new file mode 100644
index 0000000000..0c3c6c440f
--- /dev/null
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateFunction.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package com.blazebit.persistence.criteria.impl.expression.function;
+
+import java.time.LocalDate;
+import java.util.Calendar;
+
+import com.blazebit.persistence.criteria.BlazeExpression;
+import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
+import com.blazebit.persistence.criteria.impl.RenderContext;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class LocalDateFunction extends AbstractFunctionExpression<LocalDate> {
+
+    public static final String NAME = "LOCAL_DATE";
+
+    private static final long serialVersionUID = 1L;
+
+    public LocalDateFunction(BlazeCriteriaBuilderImpl criteriaBuilder) {
+        super(criteriaBuilder, LocalDate.class, NAME);
+    }
+
+    @Override
+    public void render(RenderContext context) {
+        context.getBuffer().append(getFunctionName());
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public <X> BlazeExpression<X> as(Class<X> type) {
+        if (java.util.Date.class.isAssignableFrom(type) || Calendar.class.isAssignableFrom(type)) {
+            return (BlazeExpression<X>) this;
+        }
+        return super.as(type);
+    }
+}
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateTimeFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateTimeFunction.java
new file mode 100644
index 0000000000..5d1478858b
--- /dev/null
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalDateTimeFunction.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package com.blazebit.persistence.criteria.impl.expression.function;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+
+import com.blazebit.persistence.criteria.BlazeExpression;
+import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
+import com.blazebit.persistence.criteria.impl.RenderContext;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class LocalDateTimeFunction extends AbstractFunctionExpression<LocalDateTime> {
+
+    public static final String NAME = "LOCAL_DATE_TIME";
+
+    private static final long serialVersionUID = 1L;
+
+    public LocalDateTimeFunction(BlazeCriteriaBuilderImpl criteriaBuilder) {
+        super(criteriaBuilder, LocalDateTime.class, NAME);
+    }
+
+    @Override
+    public void render(RenderContext context) {
+        context.getBuffer().append(getFunctionName());
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public <X> BlazeExpression<X> as(Class<X> type) {
+        if (java.util.Date.class.isAssignableFrom(type) || Calendar.class.isAssignableFrom(type)) {
+            return (BlazeExpression<X>) this;
+        }
+        return super.as(type);
+    }
+}
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalTimeFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalTimeFunction.java
new file mode 100644
index 0000000000..58d7def91e
--- /dev/null
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocalTimeFunction.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package com.blazebit.persistence.criteria.impl.expression.function;
+
+import java.time.LocalTime;
+import java.util.Calendar;
+
+import com.blazebit.persistence.criteria.BlazeExpression;
+import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
+import com.blazebit.persistence.criteria.impl.RenderContext;
+
+/**
+ * @author Christian Beikov
+ * @since 1.2.0
+ */
+public class LocalTimeFunction extends AbstractFunctionExpression<LocalTime> {
+
+    public static final String NAME = "LOCAL_TIME";
+
+    private static final long serialVersionUID = 1L;
+
+    public LocalTimeFunction(BlazeCriteriaBuilderImpl criteriaBuilder) {
+        super(criteriaBuilder, LocalTime.class, NAME);
+    }
+
+    @Override
+    public void render(RenderContext context) {
+        context.getBuffer().append(getFunctionName());
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public <X> BlazeExpression<X> as(Class<X> type) {
+        if (java.util.Date.class.isAssignableFrom(type) || Calendar.class.isAssignableFrom(type)) {
+            return (BlazeExpression<X>) this;
+        }
+        return super.as(type);
+    }
+}
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocateFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocateFunction.java
index afd0adccb0..80a4f742c6 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocateFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/LocateFunction.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/NullifFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/NullifFunction.java
index 4913cae0c4..3147c21560 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/NullifFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/NullifFunction.java
@@ -10,7 +10,7 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/OrderedSetAggregationFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/OrderedSetAggregationFunction.java
index 032b4c3fc2..eca3edd900 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/OrderedSetAggregationFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/OrderedSetAggregationFunction.java
@@ -13,9 +13,9 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.AbstractSelection;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/SubstringFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/SubstringFunction.java
index 44c3b5d252..6ccf9f6f54 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/SubstringFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/SubstringFunction.java
@@ -9,7 +9,7 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/TrimFunction.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/TrimFunction.java
index 9d6f28c238..90154233d7 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/TrimFunction.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/TrimFunction.java
@@ -9,8 +9,8 @@
 import com.blazebit.persistence.criteria.impl.ParameterVisitor;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.CriteriaBuilder.Trimspec;
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.CriteriaBuilder.Trimspec;
+import jakarta.persistence.criteria.Expression;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/WindowFunctionExpressionImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/WindowFunctionExpressionImpl.java
index a622769268..490174f1c4 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/WindowFunctionExpressionImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/expression/function/WindowFunctionExpressionImpl.java
@@ -20,7 +20,7 @@
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 import com.blazebit.persistence.criteria.impl.expression.AbstractSelection;
 
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractFrom.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractFrom.java
index 5821f333f6..91f4bbc470 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractFrom.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractFrom.java
@@ -18,20 +18,20 @@
 import com.blazebit.persistence.criteria.impl.expression.FromSelection;
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 
-import javax.persistence.criteria.Fetch;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Selection;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.criteria.Fetch;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractJoin.java
index 32d63ad272..617a085d71 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractJoin.java
@@ -13,11 +13,11 @@
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 import com.blazebit.persistence.criteria.impl.support.JoinSupport;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPath.java
index 339641a533..9d170816ce 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPath.java
@@ -12,12 +12,12 @@
 import com.blazebit.persistence.criteria.impl.expression.AbstractExpression;
 import com.blazebit.persistence.criteria.impl.expression.PathTypeExpression;
 
-import javax.persistence.criteria.Path;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPluralAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPluralAttributeJoin.java
index cfd5e5433f..4473072dd1 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPluralAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/AbstractPluralAttributeJoin.java
@@ -7,13 +7,13 @@
 
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.PluralJoin;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.PluralJoin;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/CollectionAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/CollectionAttributeJoin.java
index 3549483d51..b9d759409c 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/CollectionAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/CollectionAttributeJoin.java
@@ -11,12 +11,12 @@
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 import com.blazebit.persistence.criteria.impl.support.CollectionJoinSupport;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.Collection;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/EntityJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/EntityJoin.java
index 04ba8c8bde..ca44259e49 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/EntityJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/EntityJoin.java
@@ -9,11 +9,11 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/ListAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/ListAttributeJoin.java
index a214bc782e..1ed68272d1 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/ListAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/ListAttributeJoin.java
@@ -12,12 +12,12 @@
 import com.blazebit.persistence.criteria.impl.expression.function.IndexFunction;
 import com.blazebit.persistence.criteria.impl.support.ListJoinSupport;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
 import java.util.List;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapAttributeJoin.java
index 1c4b4ccefc..8b027edb3d 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapAttributeJoin.java
@@ -12,13 +12,13 @@
 import com.blazebit.persistence.criteria.impl.expression.function.EntryFunction;
 import com.blazebit.persistence.criteria.impl.support.MapJoinSupport;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
 import java.util.Map;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyAttribute.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyAttribute.java
index 9d681d9b2e..d9aa59250b 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyAttribute.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyAttribute.java
@@ -7,11 +7,11 @@
 
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 
-import javax.persistence.metamodel.Bindable;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import java.io.Serializable;
 import java.lang.reflect.Member;
 import java.util.Map;
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyBasePath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyBasePath.java
index 919292c98d..a4fbdd6f87 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyBasePath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyBasePath.java
@@ -8,10 +8,10 @@
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Path;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Bindable;
-import javax.persistence.metamodel.MapAttribute;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.MapAttribute;
 import java.util.Map;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyPath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyPath.java
index d11efb9edd..e826e60f6d 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyPath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/MapKeyPath.java
@@ -8,9 +8,9 @@
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Path;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Bindable;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Bindable;
 import java.io.Serializable;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/PluralAttributePath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/PluralAttributePath.java
index c30be588c9..2718e47157 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/PluralAttributePath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/PluralAttributePath.java
@@ -7,10 +7,10 @@
 
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 
-import javax.persistence.criteria.Selection;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Bindable;
-import javax.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.PluralAttribute;
 import java.io.Serializable;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/RootImpl.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/RootImpl.java
index 76462855f3..459a3011fb 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/RootImpl.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/RootImpl.java
@@ -10,8 +10,8 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
 import java.io.Serializable;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SetAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SetAttributeJoin.java
index 2aad42faa2..9a1f0e1306 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SetAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SetAttributeJoin.java
@@ -11,12 +11,12 @@
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 import com.blazebit.persistence.criteria.impl.support.SetJoinSupport;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SetAttribute;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SetAttribute;
 import java.util.Set;
 
 /**
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributeJoin.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributeJoin.java
index 35dfc66495..9786e65f4e 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributeJoin.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributeJoin.java
@@ -9,16 +9,16 @@
 import com.blazebit.persistence.criteria.impl.RenderContext;
 import com.blazebit.persistence.criteria.impl.expression.SubqueryExpression;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Bindable;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributePath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributePath.java
index 073b6aee88..92d71e4848 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributePath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/SingularAttributePath.java
@@ -8,14 +8,14 @@
 import com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderImpl;
 import com.blazebit.persistence.criteria.impl.RenderContext;
 
-import javax.persistence.criteria.Selection;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Bindable;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Bindable;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/TreatedPath.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/TreatedPath.java
index dc8ea967e1..e392a74c35 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/TreatedPath.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/path/TreatedPath.java
@@ -7,7 +7,7 @@
 
 import com.blazebit.persistence.criteria.BlazePath;
 
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.EntityType;
 
 /**
  * @author Christian Beikov
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CollectionJoinSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CollectionJoinSupport.java
index 3dfbfbfaf4..01a8141852 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CollectionJoinSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CollectionJoinSupport.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CriteriaBuilderSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CriteriaBuilderSupport.java
index eaf2d4940c..29444b6e6f 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CriteriaBuilderSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/CriteriaBuilderSupport.java
@@ -5,16 +5,16 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.CollectionJoin;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.CollectionJoin;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/JoinSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/JoinSupport.java
index 4aacdf2877..247efd77de 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/JoinSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/JoinSupport.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/ListJoinSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/ListJoinSupport.java
index aaea1a4b83..ecdabc45c4 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/ListJoinSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/ListJoinSupport.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.ListJoin;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.ListJoin;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/MapJoinSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/MapJoinSupport.java
index 42ebd8aa0c..5f413517ad 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/MapJoinSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/MapJoinSupport.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.MapJoin;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.MapJoin;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SetJoinSupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SetJoinSupport.java
index a742fa23be..799ee1394b 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SetJoinSupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SetJoinSupport.java
@@ -5,9 +5,9 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.SetJoin;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.SetJoin;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SubquerySupport.java b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SubquerySupport.java
index 4c93586f04..75229a87bd 100644
--- a/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SubquerySupport.java
+++ b/jpa-criteria/impl/src/main/java/com/blazebit/persistence/criteria/impl/support/SubquerySupport.java
@@ -5,8 +5,8 @@
 
 package com.blazebit.persistence.criteria.impl.support;
 
-import javax.persistence.criteria.CommonAbstractCriteria;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.CommonAbstractCriteria;
+import jakarta.persistence.criteria.Subquery;
 
 /**
  * An interface necessary to be able to compile against JPA 2.0 but let users use JPA 2.1 APIs.
diff --git a/jpa-criteria/impl/src/main/java/module-info.java b/jpa-criteria/impl/src/main/java/module-info.java
new file mode 100644
index 0000000000..c3ce657c10
--- /dev/null
+++ b/jpa-criteria/impl/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.criteria.impl {
+	requires com.blazebit.common.utils;
+	requires transitive com.blazebit.persistence.criteria;
+	requires jakarta.persistence;
+	requires com.blazebit.persistence.core.parser;
+	exports com.blazebit.persistence.criteria.impl;
+	provides com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory with com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderFactoryImpl;
+}
\ No newline at end of file
diff --git a/jpa-criteria/impl/src/main/resources/META-INF/services/com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory b/jpa-criteria/impl/src/main/resources/META-INF/services/com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory
new file mode 100644
index 0000000000..11fd2cfd1d
--- /dev/null
+++ b/jpa-criteria/impl/src/main/resources/META-INF/services/com.blazebit.persistence.criteria.spi.BlazeCriteriaBuilderFactory
@@ -0,0 +1 @@
+com.blazebit.persistence.criteria.impl.BlazeCriteriaBuilderFactoryImpl
diff --git a/jpa-criteria/jpa-2-compatibility-jar/pom.xml b/jpa-criteria/jpa-2-compatibility-jar/pom.xml
deleted file mode 100644
index 9afa08d204..0000000000
--- a/jpa-criteria/jpa-2-compatibility-jar/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility-jar</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.jpa2compatibility</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <filters>
-                                <filter>
-                                    <artifact>${project.groupId}:blaze-persistence-jpa-criteria-jpa-2-compatibility</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/versions/**</exclude>
-                                        <exclude>module-info.class</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>shade-javadoc</id>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                            <classifier>javadoc</classifier>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                            <destFileName>${project.artifactId}-${project.version}-javadoc.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/jpa-2-compatibility/.gitignore b/jpa-criteria/jpa-2-compatibility/.gitignore
deleted file mode 100644
index b83d22266a..0000000000
--- a/jpa-criteria/jpa-2-compatibility/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/jpa-criteria/jpa-2-compatibility/pom.xml b/jpa-criteria/jpa-2-compatibility/pom.xml
deleted file mode 100644
index 8e93e41345..0000000000
--- a/jpa-criteria/jpa-2-compatibility/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-    <packaging>jar</packaging>
-    
-    <name>Blazebit Persistence JPA-2 Compatibility</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.jpa2compatibility</module.name>
-    </properties>
-
-    <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-</project>
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/AttributeConverter.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/AttributeConverter.java
deleted file mode 100644
index 9264e36640..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/AttributeConverter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011 Oracle, Inc. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.  The Eclipse Public License is available
- * at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License
- * is available at http://www.eclipse.org/org/documents/edl-v10.php.
- */
-package javax.persistence;
-
-/**
- * A class that implements this interface can be used to convert
- * entity attribute state into database column representation
- * and back again.
- * Note that the X and Y types may be the same Java type.
- *
- * @param <X> the type of the entity attribute
- * @param <Y> the type of the database column
- * @since Java Persistence 2.1
- */
-public interface AttributeConverter<X, Y> {
-    /**
-     * Converts the value stored in the entity attribute into the
-     * data representation to be stored in the database.
-     *
-     * @param attribute the entity attribute value to be converted
-     * @return the converted data to be stored in the database column
-     */
-    Y convertToDatabaseColumn(X attribute);
-
-    /**
-     * Converts the data stored in the database column into the
-     * value to be stored in the entity attribute.
-     * Note that it is the responsibility of the converter writer to
-     * specify the correct dbData type for the corresponding column
-     * for use by the JDBC driver: i.e., persistence providers are
-     * not expected to do such type conversion.
-     *
-     * @param dbData the data from the database column to be converted
-     * @return the converted value to be stored in the entity attribute
-     */
-    X convertToEntityAttribute(Y dbData);
-}
\ No newline at end of file
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Convert.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Convert.java
deleted file mode 100644
index ed0d59a5c9..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Convert.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011 Oracle, Inc. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.  The Eclipse Public License is available
- * at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License
- * is available at http://www.eclipse.org/org/documents/edl-v10.php.
- */
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * The Convert annotation is used to specify the conversion of a Basic field or
- * property. It is not necessary to use the Basic annotation or corresponding XML
- * element to specify the basic type.
- *
- * @since Java Persistence 2.1
- */
-@Target({METHOD, FIELD, TYPE})
-@Retention(RUNTIME)
-public @interface Convert {
-    /**
-     * Specifies the converter to be applied. A value for this
-     * element must be specified if multiple converters would
-     * otherwise apply.
-     * @return The converter class
-     */
-    Class converter() default void.class;
-
-    /**
-     * The attributeName must be specified unless the Convert annotation
-     * is on an attribute of basic type or on an element collection of
-     * basic type. In these cases, attributeName must not be
-     * specified.
-     * @return The attribute name
-     */
-    String attributeName() default "";
-
-    /**
-     * Used to disable an auto-apply or inherited converter.
-     * If disableConversion is true, the converter element should
-     * not be specified.
-     * @return Whether to disable auto-apply or inherited converter
-     */
-    boolean disableConversion() default false;
-}
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Converter.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Converter.java
deleted file mode 100644
index 68a125667e..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/Converter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- *     Linda DeMichiel - Java Persistence 2.1
- *
- ******************************************************************************/
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies that the annotated class is a converter and defines its
- * scope.  A converter class must be annotated with the <code>Converter</code>
- * annotation or defined in the object/relational mapping descriptor as
- * a converter.
- *
- * <p>If the <code>autoApply</code> element is specified as
- * <code>true</code>, the persistence provider must automatically
- * apply the converter to all mapped attributes of the specified
- * target type for all entities in the persistence unit except for
- * attributes for which conversion is overridden by means of the
- * <code>Convert</code> annotation (or XML equivalent).
- *
- * <p>In determining whether a converter is applicable to an attribute,
- * the provider must treat primitive types and wrapper types as
- * equivalent.
- *
- * <p>Note that Id attributes, version attributes, relationship
- * attributes, and attributes explicitly annotated as
- * <code>Enumerated</code> or <code>Temporal</code> (or designated as
- * such via XML) will not be converted.
- *
- * <p>Note that if <code>autoApply</code> is <code>true</code>, the
- * <code>Convert</code> annotation may be used to override or disable
- * auto-apply conversion on a per-attribute basis.
- *
- * <p>If <code>autoApply</code> is <code>false</code>, only those
- * attributes of the target type for which the <code>Convert</code>
- * annotation (or corresponding XML element) has been specified will
- * be converted.
- *
- * <p>If there is more than one converter defined for the same target
- * type, the <code>Convert</code> annotation should be used to
- * explicitly specify which converter to use.
- *
- * @see AttributeConverter
- * @see Convert
- *
- * @since Java Persistence 2.1
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface Converter {
-    boolean autoApply() default false;
-}
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CommonAbstractCriteria.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CommonAbstractCriteria.java
deleted file mode 100644
index 43340194d5..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CommonAbstractCriteria.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011 Oracle, Inc. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.  The Eclipse Public License is available
- * at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License
- * is available at http://www.eclipse.org/org/documents/edl-v10.php.
- */
-package javax.persistence.criteria;
-
-/**
- * The <code>CommonAbstractCriteria</code> interface defines functionality
- * that is common to both top-level criteria queries and subqueries as
- * well as to update and delete criteria operations.
- * It is not intended to be used directly in query construction.
- *
- * <p> Note that criteria queries and criteria update and delete operations
- * are typed differently.
- * Criteria queries are typed according to the query result type.
- * Update and delete operations are typed according to the target of the
- * update or delete.
- *
- * @since Java Persistence 2.1
- */
-public interface CommonAbstractCriteria {
-
-    /**
-     * Create a subquery of the query.
-     *
-     * @param type the subquery result type
-     * @return subquery
-     */
-    <U> Subquery<U> subquery(Class<U> type);
-
-    /**
-     * Return the predicate that corresponds to the where clause
-     * restriction(s), or null if no restrictions have been
-     * specified.
-     *
-     * @return where clause predicate
-     */
-    Predicate getRestriction();
-}
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaDelete.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaDelete.java
deleted file mode 100644
index 9a71235bf0..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaDelete.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011 Oracle, Inc. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.  The Eclipse Public License is available
- * at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License
- * is available at http://www.eclipse.org/org/documents/edl-v10.php.
- */
-package javax.persistence.criteria;
-
-import javax.persistence.metamodel.EntityType;
-
-/**
- * The <code>CriteriaDelete</code> interface defines functionality for performing
- * bulk delete operations using the Criteria API
- *
- * <p>Criteria API bulk delete operations map directly to database
- * delete operations.  The persistence context is not synchronized
- * with the result of the bulk delete.
- *
- * <p> A <code>CriteriaDelete</code> object must have a single root.
- *
- * @param <T> the entity type that is the target of the delete
- * @since Java Persistence 2.1
- */
-public interface CriteriaDelete<T> extends CommonAbstractCriteria {
-
-    /**
-     * Create and add a query root corresponding to the entity
-     * that is the target of the delete.
-     * A <code>CriteriaDelete</code> object has a single root, the entity that
-     * is being deleted.
-     *
-     * @param entityClass the entity class
-     * @return query root corresponding to the given entity
-     */
-    Root<T> from(Class<T> entityClass);
-
-    /**
-     * Create and add a query root corresponding to the entity
-     * that is the target of the delete.
-     * A <code>CriteriaDelete</code> object has a single root, the entity that
-     * is being deleted.
-     *
-     * @param entity metamodel entity representing the entity
-     *               of type X
-     * @return query root corresponding to the given entity
-     */
-    Root<T> from(EntityType<T> entity);
-
-    /**
-     * Return the query root.
-     *
-     * @return the query root
-     */
-    Root<T> getRoot();
-
-    /**
-     * Modify the delete query to restrict the target of the deletion
-     * according to the specified boolean expression.
-     * Replaces the previously added restriction(s), if any.
-     *
-     * @param restriction a simple or compound boolean expression
-     * @return the modified delete query
-     */
-    CriteriaDelete<T> where(Expression<Boolean> restriction);
-
-    /**
-     * Modify the delete query to restrict the target of the deletion
-     * according to the conjunction of the specified restriction
-     * predicates.
-     * Replaces the previously added restriction(s), if any.
-     * If no restrictions are specified, any previously added
-     * restrictions are simply removed.
-     *
-     * @param restrictions zero or more restriction predicates
-     * @return the modified delete query
-     */
-    CriteriaDelete<T> where(Predicate... restrictions);
-
-}
diff --git a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaUpdate.java b/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaUpdate.java
deleted file mode 100644
index 5334e9e919..0000000000
--- a/jpa-criteria/jpa-2-compatibility/src/main/java/javax/persistence/criteria/CriteriaUpdate.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011 Oracle, Inc. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.  The Eclipse Public License is available
- * at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License
- * is available at http://www.eclipse.org/org/documents/edl-v10.php.
- */
-package javax.persistence.criteria;
-
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.SingularAttribute;
-
-/**
- * The CriteriaUpdate interface defines functionality for performing
- * bulk update operations using the Criteria API.
- * <p/>
- * Criteria API bulk update operations map directly to database update
- * operations, bypassing any optimistic locking checks. Portable
- * applications using bulk update operations must manually update the
- * value of the version column, if desired, and/or manually validate
- * the value of the version column.
- * The persistence context is not synchronized with the result of the
- * bulk update.
- * <p/>
- * A CriteriaUpdate object must have a single root.
- *
- * @param <T> the entity type that is the target of the update
- * @since Java Persistence 2.1
- */
-public interface CriteriaUpdate<T> extends CommonAbstractCriteria {
-
-    /**
-     * Create and add a query root corresponding to the entity
-     * that is the target of the update.
-     * A CriteriaUpdate object has a single root, the object that
-     * is being updated.
-     *
-     * @param entityClass the entity class
-     * @return query root corresponding to the given entity
-     */
-    Root<T> from(Class<T> entityClass);
-
-    /**
-     * Create and add a query root corresponding to the entity
-     * that is the target of the update.
-     * A CriteriaUpdate object has a single root, the object that
-     * is being updated.
-     *
-     * @param entity metamodel entity representing the entity of type X
-     * @return query root corresponding to the given entity
-     */
-    Root<T> from(EntityType<T> entity);
-
-    /**
-     * Return the query root.
-     *
-     * @return the query root
-     */
-    Root<T> getRoot();
-
-    /**
-     * Update the value of the specified attribute.
-     *
-     * @param attribute attribute to be updated
-     * @param value     new value
-     * @return the modified query
-     */
-    <Y, X extends Y> CriteriaUpdate<T> set(SingularAttribute<? super T, Y> attribute, X value);
-
-    /**
-     * Update the value of the specified attribute.
-     *
-     * @param attribute attribute to be updated
-     * @param value     new value
-     * @return the modified query
-     */
-    <Y> CriteriaUpdate<T> set(SingularAttribute<? super T, Y> attribute, Expression<? extends Y> value);
-
-    /**
-     * Update the value of the specified attribute.
-     *
-     * @param attribute attribute to be updated
-     * @param value     new value
-     * @return the modified query
-     */
-    <Y, X extends Y> CriteriaUpdate<T> set(Path<Y> attribute, X value);
-
-    /**
-     * Update the value of the specified attribute.
-     *
-     * @param attribute attribute to be updated
-     * @param value     new value
-     * @return the modified query
-     */
-    <Y> CriteriaUpdate<T> set(
-            Path<Y> attribute,
-            Expression<? extends Y> value);
-
-    /**
-     * Update the value of the specified attribute.
-     *
-     * @param attributeName name of the attribute to be updated
-     * @param value         new value
-     * @return the modified query
-     */
-    CriteriaUpdate<T> set(String attributeName, Object value);
-
-    /**
-     * Modify the query to restrict the target of the update
-     * according to the specified boolean expression.
-     * Replaces the previously added restriction(s), if any.
-     *
-     * @param restriction a simple or compound boolean expression
-     * @return the modified query
-     */
-    CriteriaUpdate<T> where(Expression<Boolean> restriction);
-
-    /**
-     * Modify the query to restrict the target of the update
-     * according to the conjunction of the specified restriction
-     * predicates.
-     * Replaces the previously added restriction(s), if any.
-     * If no restrictions are specified, any previously added
-     * restrictions are simply removed.
-     *
-     * @param restrictions zero or more restriction predicates
-     * @return the modified query
-     */
-    CriteriaUpdate<T> where(Predicate... restrictions);
-}
diff --git a/jpa-criteria/pom.xml b/jpa-criteria/pom.xml
index 8e26aca213..249d2110f9 100644
--- a/jpa-criteria/pom.xml
+++ b/jpa-criteria/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -22,53 +22,7 @@
     <modules>
         <module>api</module>
         <module>impl</module>
-        <module>jpa-2-compatibility</module>
         <module>testsuite</module>
-
-        <module>api-jar</module>
-        <module>impl-jar</module>
-        <module>jpa-2-compatibility-jar</module>
-
-        <module>api-jakarta</module>
-        <module>impl-jakarta</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>jakarta</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>jpa-2-compatibility</module>
-                <module>testsuite</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-                <module>jpa-2-compatibility-jar</module>
-
-                <module>api-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>jpa-2-compatibility</module>
-                <module>testsuite</module>
-
-                <module>api-jar</module>
-                <module>impl-jar</module>
-                <module>jpa-2-compatibility-jar</module>
-
-                <module>api-jakarta</module>
-                <module>impl-jakarta</module>
-                <module>testsuite-jakarta</module>
-                <module>testsuite-jakarta-runner</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/jpa-criteria/testsuite-jakarta-runner/pom.xml b/jpa-criteria/testsuite-jakarta-runner/pom.xml
deleted file mode 100644
index 10633ebb0d..0000000000
--- a/jpa-criteria/testsuite-jakarta-runner/pom.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-testsuite-jakarta-runner</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.testsuite.runner</module.name>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
-        <jpa-api-version>${version.jakarta-jpa-api}</jpa-api-version>
-        <version.h2>${h2-2.version}</version.h2>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${jpa-api-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch</groupId>
-            <artifactId>junit-benchmarks</artifactId>
-            <version>0.7.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${version.h2}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <jdbc.url>jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1</jdbc.url>
-                        <jdbc.user>admin</jdbc.user>
-                        <jdbc.password>admin</jdbc.password>
-                        <jdbc.driver>org.h2.Driver</jdbc.driver>
-                        <user.timezone>UTC</user.timezone>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>com.blazebit:blaze-persistence-jpa-criteria-testsuite-jakarta</dependency>
-                    </dependenciesToScan>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>${version.surefire.plugin}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>hibernate-6.2</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.4</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.4}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <properties>
-                <jpa-api-version>${version.jakarta-jpa-3.1-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-envers</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-testing</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>${version.jakarta-jaxb-api}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>${version.jakarta-jaxb}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.transaction</groupId>
-                    <artifactId>jakarta.transaction-api</artifactId>
-                    <version>${version.jakarta-jta}</version>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                    <version>${version.jakarta-activation}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-6.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/testsuite-jakarta/pom.xml b/jpa-criteria/testsuite-jakarta/pom.xml
deleted file mode 100644
index d84ab4835f..0000000000
--- a/jpa-criteria/testsuite-jakarta/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-jpa-criteria-testsuite-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.criteria.testsuite</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-jpa-criteria-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-testsuite-jakarta</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- If new integrations arrive, we can use profiles -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-
-        <!-- Add mockito early to the local maven repo since the Hibernate,DB2 build froze on downloading this dependency -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-jpa-criteria-testsuite:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-testsuite:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-testsuite:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-jpa-criteria-testsuite:jar}" regexp="\.jar$" replace="-tests.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-tests.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                    <classifier>tests</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-tests.jar</file>
-                                            <classifier>tests</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/jpa-criteria/testsuite/pom.xml b/jpa-criteria/testsuite/pom.xml
index 73cbdafe44..71a82912a7 100644
--- a/jpa-criteria/testsuite/pom.xml
+++ b/jpa-criteria/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,9 +20,6 @@
     <name>Blazebit Persistence JPA-Criteria Testsuite</name>
 
     <properties>
-        <!-- We use Java 8 for a few tests -->
-        <test.java.version>1.8</test.java.version>
-        <main.java.version>${test.java.version}</main.java.version>
         <module.name>com.blazebit.persistence.criteria.testsuite</module.name>
     </properties>
 
@@ -42,6 +39,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>blaze-persistence-core-api</artifactId>
@@ -107,7 +109,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${version.annotation}</version>
+            <version>${version.annotation-api}</version>
         </dependency>
     </dependencies>
 
@@ -142,1048 +144,150 @@
 
         <!-- JPA provider profiles -->
         <profile>
-            <id>hibernate</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.2}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>1.3.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>1.3.0.Final</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-4.3</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-4.3}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-4.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.0</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.1</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.1}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.1}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.2</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.javassist</groupId>
-                            <artifactId>javassist</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.2}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.2}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.3</id>
+            <id>hibernate-6.2</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.3}</version>
-                    <scope>provided</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.3}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.4}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.2}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                    <scope>test</scope>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.4}</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.4}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-5.5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.5}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.5}</version>
+                    <version>${version.hibernate-6.2}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.2}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                            <!-- ORM 6.2 still added the javax annotation -->
+                            <compilerArgs>
+                                <compilerArg>-AaddGeneratedAnnotation=false</compilerArg>
+                            </compilerArgs>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-5.6</id>
+            <id>hibernate-6.4</id>
             <properties>
                 <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.2</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.4}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.3</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -1192,349 +296,102 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-6.4}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <skip>true</skip>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.4}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>hibernate-6.4</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
+            <id>hibernate-6.6</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-6.6}</version>
                 </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.5</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60</jpa.excludedGroups>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
-                    <scope>test</scope>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <!-- IntelliJ apparently needs the annotation processor here -->
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-6.6</id>
-            <!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -1543,101 +400,56 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-6.6}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <skip>true</skip>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-6.6}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -1668,702 +480,145 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <eclipselink.persistencexml>${basedir}/src/test/resources/META-INF/persistence.xml</eclipselink.persistencexml>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.eclipse.persistence</groupId>
-                                <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-                                <version>${version.eclipselink}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-4</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus,com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-4}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.eclipse.persistence</groupId>
+                                    <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+                                    <version>${version.eclipselink}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <compilerArgs>
+                                <compilerArg>-Aeclipselink.persistencexml=${basedir}/src/test/resources/META-INF/persistence.xml</compilerArg>
+                                <compilerArg>-Aeclipselink.canonicalmodel.use_generated=false</compilerArg>
+                            </compilerArgs>
+                            <annotationProcessors>
+                                <processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+                            </annotationProcessors>
                         </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- The old version has a bug when generating the static metamodel for PolymorphicPropertyMapBase -->
-                            <dependency>
-                                <groupId>org.datanucleus</groupId>
-                                <artifactId>datanucleus-jpa-query</artifactId>
-                                <version>${version.datanucleus.jpa-5}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>datanucleus-5</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.1.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>datanucleus-5.1</id>
+            <id>hibernate-apt</id>
             <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus</jpa.excludedGroups>
-                <spring.activeProfiles>datanucleus</spring.activeProfiles>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
             </properties>
-            <repositories>
-                <repository>
-                    <id>DataNucleus Nightly</id>
-                    <name>DataNucleus Repository Nightly</name>
-                    <url>https://www.datanucleus.org/downloads/maven2-nightly</url>
-                </repository>
-            </repositories>
             <dependencies>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                    <version>2.2.0-release</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>${version.datanucleus.base-5.1}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-envers</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>${version.datanucleus.api-jpa-5.1}</version>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-testing</artifactId>
+                    <version>${version.hibernate-apt}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jpa-query</artifactId>
-                    <version>${version.datanucleus.jpa-5.1}</version>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>${version.jaxb-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>${version.datanucleus.rdbms-5.1}</version>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>${version.jaxb}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                    <scope>compile</scope>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>${version.jta-api}</version>
                 </dependency>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>4.0.0-release</version>
-                        <configuration>
-                            <api>JPA</api>
-                            <persistenceUnitName>TestsuiteBase</persistenceUnitName>
-                            <verbose>false</verbose>
-                            <fork>true</fork>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                            <metadataDirectory>${project.build.outputDirectory}</metadataDirectory>
-                            <useFileListFile>true</useFileListFile>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.datanucleus.jpa.query.JPACriteriaProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openjpa</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa-all</artifactId>
-                    <version>${version.openjpa}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <version>${version.activation-api}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor>
-                                    </processors>
-                                    <optionMap>
-                                        <openjpa.metamodel>true</openjpa.metamodel>
-                                    </optionMap>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.openjpa</groupId>
-                                <artifactId>openjpa-all</artifactId>
-                                <version>${version.openjpa}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>hibernate-apt</id>
-            <properties>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate</jpa.excludedGroups>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>${version.hibernate-5.6}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+                    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                    <scope>test</scope>
+                    <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <!-- IntelliJ apparently needs the annotation processor here -->
                 <dependency>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-jpamodelgen</artifactId>
-                    <version>${version.hibernate-5.6}</version>
+                    <version>${version.hibernate-apt}</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process-test</id>
-                                <goals>
-                                    <goal>process-test</goal>
-                                </goals>
-                                <phase>generate-test-sources</phase>
-                                <configuration>
-                                    <!-- source output directory -->
-                                    <outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
-                                    <processors>
-                                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                                    </processors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <!-- Metamodel -->
-                            <dependency>
-                                <groupId>org.hibernate</groupId>
-                                <artifactId>hibernate-jpamodelgen</artifactId>
-                                <version>${version.hibernate-5.6}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.xml.bind</groupId>
-                                <artifactId>jakarta.xml.bind-api</artifactId>
-                                <version>${version.jaxb-api}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>com.sun.xml.bind</groupId>
-                                <artifactId>jaxb-impl</artifactId>
-                                <version>${version.jaxb}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.transaction</groupId>
-                                <artifactId>jakarta.transaction-api</artifactId>
-                                <version>${version.jta}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>jakarta.activation</groupId>
-                                <artifactId>jakarta.activation-api</artifactId>
-                                <version>${version.activation}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source-metamodel</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/test-metamodel</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <!-- Metamodel -->
+                                <dependency>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${version.hibernate-apt}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.xml.bind</groupId>
+                                    <artifactId>jakarta.xml.bind-api</artifactId>
+                                    <version>${version.jaxb-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-impl</artifactId>
+                                    <version>${version.jaxb}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.transaction</groupId>
+                                    <artifactId>jakarta.transaction-api</artifactId>
+                                    <version>${version.jta-api}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
+                                    <version>${version.activation-api}</version>
+                                </dependency>
+                            </annotationProcessorPaths>
+                            <annotationProcessors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </annotationProcessors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/DeleteTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/DeleteTest.java
index ca6536b7dc..4b252589ed 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/DeleteTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/DeleteTest.java
@@ -12,7 +12,7 @@
 import com.blazebit.persistence.testsuite.entity.Document_;
 import org.junit.Test;
 
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java
index 80ce49ef0b..25a16412e5 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java
@@ -5,11 +5,12 @@
 
 package com.blazebit.persistence.criteria;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable;
@@ -20,10 +21,7 @@
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
 import com.blazebit.persistence.testsuite.entity.NameObject_;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,7 +31,7 @@
  * @since 1.6.3
  */
 // NOTE: See EmbeddableComplexTest for details about why we need to ignore DataNucleus and EclipseLink
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class EmbeddableJoinTest extends AbstractCoreTest {
 
     @Override
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/GroupByTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/GroupByTest.java
index d253c867a1..f338904579 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/GroupByTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/GroupByTest.java
@@ -7,8 +7,8 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.Tuple;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.Root;
 
 import org.junit.Test;
 
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java
index 250c0e8790..bfb5dca214 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java
@@ -5,13 +5,12 @@
 
 package com.blazebit.persistence.criteria;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
-import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps;
-import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps_;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer;
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable;
@@ -21,13 +20,6 @@
 import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity_;
 import com.blazebit.persistence.testsuite.entity.IntIdEntity;
 import com.blazebit.persistence.testsuite.entity.NameObject;
-import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps;
-import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps_;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -37,8 +29,7 @@
  * @since 1.2.1
  */
 // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062
-// TODO: report that datanucleus doesn't support element collection in an embeddable
-@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+@Category({ NoEclipselink.class })
 public class JoinMapKeyEmbeddableTest extends AbstractCoreTest {
 
     @Override
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java
index 56f247f642..bd3c6aee91 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java
@@ -5,11 +5,6 @@
 
 package com.blazebit.persistence.criteria;
 
-import static org.junit.Assert.assertEquals;
-
-import javax.persistence.criteria.JoinType;
-
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import org.junit.Test;
 
 import com.blazebit.persistence.CriteriaBuilder;
@@ -18,7 +13,9 @@
 import com.blazebit.persistence.testsuite.entity.Document_;
 import com.blazebit.persistence.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.entity.Person_;
-import org.junit.experimental.categories.Category;
+import jakarta.persistence.criteria.JoinType;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -123,8 +120,6 @@ public void listMapJoinWithFunctions() {
     }
 
     @Test
-    // TODO: Report that SingularAttributeImpl#getBindableType() returns ENTITY_TYPE instead of SINGULAR_ATTRIBUTE
-    @Category(NoDatanucleus.class)
     public void listStringMapEmbeddableJoinWithFunctions() {
         BlazeCriteriaQuery<Long> cq = BlazeCriteria.get(cbf, Long.class);
         BlazeCriteriaBuilder cb = cq.getCriteriaBuilder();
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/ListaggTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/ListaggTest.java
index 049bf3c4cf..9ed1aeb4c2 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/ListaggTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/ListaggTest.java
@@ -18,9 +18,9 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.JoinType;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/OrderByTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/OrderByTest.java
index c73d5b39b3..dffecdc9ec 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/OrderByTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/OrderByTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 import org.junit.Test;
 
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/SelectTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/SelectTest.java
index 589d365cde..7934cc39cf 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/SelectTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/SelectTest.java
@@ -16,10 +16,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.TupleElement;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TupleElement;
+import jakarta.persistence.criteria.Root;
 
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.testsuite.tx.TxWork;
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java
index 0a59d9889f..0e217283d4 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java
@@ -5,16 +5,22 @@
 
 package com.blazebit.persistence.criteria;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.JoinType;
 import com.blazebit.persistence.testsuite.AbstractCoreTest;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
-import com.blazebit.persistence.testsuite.entity.*;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.persistence.Tuple;
+import com.blazebit.persistence.testsuite.entity.IntIdEntity;
+import com.blazebit.persistence.testsuite.entity.PolymorphicBase;
+import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer;
+import com.blazebit.persistence.testsuite.entity.PolymorphicBase_;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub1;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub1_;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub2;
+import com.blazebit.persistence.testsuite.entity.PolymorphicSub2_;
+import jakarta.persistence.Tuple;
 
 import static org.junit.Assert.assertEquals;
 
@@ -80,7 +86,7 @@ public void treatRoot() {
 
     @Test
     // Eclipselink does not support dereferencing of TREAT join path elements
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void treatRootJoin() {
         BlazeCriteriaQuery<PolymorphicBase> cq = BlazeCriteria.get(cbf, PolymorphicBase.class);
         BlazeCriteriaBuilder cb = cq.getCriteriaBuilder();
@@ -143,7 +149,7 @@ public void treatJoin() {
 
     @Test
     // Eclipselink does not support dereferencing of TREAT join path elements
-    @Category({ NoDatanucleus.class, NoEclipselink.class })
+    @Category({ NoEclipselink.class })
     public void joinTreatedJoinWithOnClause() {
         BlazeCriteriaQuery<Tuple> cq = BlazeCriteria.get(cbf, Tuple.class);
         BlazeCriteriaBuilder cb = cq.getCriteriaBuilder();
diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/WhereTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/WhereTest.java
index 5b14c11ed4..06ce27b051 100644
--- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/WhereTest.java
+++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/WhereTest.java
@@ -18,8 +18,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.*;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.*;
 import java.sql.Timestamp;
 import java.util.*;
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 516839844b..f309d2a4a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,135 +22,76 @@
     <description>Blaze-Persistence Parent</description>
 
     <properties>
-        <blaze-persistence.codename>Lockjaw</blaze-persistence.codename>
+        <blaze-persistence.codename>Enchantress</blaze-persistence.codename>
+
+        <version.jpa-api>3.1.0</version.jpa-api>
+        <version.interceptor-api>2.0.1</version.interceptor-api>
+        <version.atinject-api>2.0.0</version.atinject-api>
+        <version.cdi-api>4.0.1</version.cdi-api>
+        <version.el-api>5.0.1</version.el-api>
+        <version.jaxrs-api>3.1.0</version.jaxrs-api>
+        <version.servlet-api>6.0.0</version.servlet-api>
+        <version.jaxb-api>3.0.1</version.jaxb-api>
+        <version.jaxb>3.0.2</version.jaxb>
+        <version.jta-api>2.0.1</version.jta-api>
+        <version.validation-api>3.0.2</version.validation-api>
+        <version.activation-api>2.0.1</version.activation-api>
+        <version.annotation-api>2.1.1</version.annotation-api>
+        <version.jsonb-api>3.0.1</version.jsonb-api>
+        <version.json-api>2.1.3</version.json-api>
+        <version.ejb-api>4.0.1</version.ejb-api>
 
-        <version.servlet>4.0.1</version.servlet>
-        <version.jakarta-servlet>6.0.0</version.jakarta-servlet>
-        <version.jaxb-api>2.3.3</version.jaxb-api>
-        <version.jakarta-jaxb-api>3.0.1</version.jakarta-jaxb-api>
-        <version.jaxb>2.3.3</version.jaxb>
-        <version.jakarta-jaxb>3.0.2</version.jakarta-jaxb>
-        <version.jta>1.3.3</version.jta>
-        <version.jakarta-jta>2.0.0</version.jakarta-jta>
-        <version.validation>2.0.1.Final</version.validation>
-        <version.activation>1.2.2</version.activation>
-        <version.jakarta-activation>2.0.1</version.jakarta-activation>
-        <version.annotation>1.3.5</version.annotation>
-        <version.jakarta-annotation>2.1.1</version.jakarta-annotation>
         <version.blazecbav>0.2.0</version.blazecbav>
         <version.blazeutils>0.1.21</version.blazeutils>
         <version.mockito>4.11.0</version.mockito>
         <version.bytebuddy>1.14.4</version.bytebuddy>
-        <version.junit>4.12</version.junit>
-        <version.junit-vintage>5.9.1</version.junit-vintage>
-        <version.javassist>3.29.2-GA</version.javassist>
+        <version.junit>4.13.2</version.junit>
+        <version.junit-platform>1.11.3</version.junit-platform>
+        <version.junit-vintage>5.11.3</version.junit-vintage>
+        <version.junit-jupiter>5.11.3</version.junit-jupiter>
+        <version.javassist>3.30.2-GA</version.javassist>
         <querydsl.version>5.0.0</querydsl.version>
         <!-- 1.18 messed up calculation of load index -->
         <version.bridge-injector>1.17</version.bridge-injector>
         <version.bridge-injector-asm>9.5</version.bridge-injector-asm>
         <version.bridge-injector-indexer>1.12</version.bridge-injector-indexer>
 
-        <!-- Minimum version is 4.2.8.Final -->
-        <!-- 4.2.15.Final has a bug regarding naming strategies -->
-        <version.hibernate-4.2>4.2.21.Final</version.hibernate-4.2>
-        <version.hibernate-4.3>4.3.11.Final</version.hibernate-4.3>
-        <version.hibernate-5>5.0.12.Final</version.hibernate-5>
-        <version.hibernate-5.1>5.1.5.Final</version.hibernate-5.1>
-        <!-- The SQLServer Dialect had a bug before 5.2.9.Final making it impossible to use pagination -->
-        <version.hibernate-5.2>5.2.18.Final</version.hibernate-5.2>
-        <version.hibernate-5.3>5.3.1.Final</version.hibernate-5.3>
-        <!-- Older versions had an issue with rendering NULL in the IN predicate -->
-        <version.hibernate-5.4>5.4.10.Final</version.hibernate-5.4>
-        <version.hibernate-5.5>5.5.0.Final</version.hibernate-5.5>
-        <version.hibernate-5.6>5.6.10.Final</version.hibernate-5.6>
-        <version.hibernate-6.2>6.2.13.Final</version.hibernate-6.2>
-        <version.hibernate-6.3>6.3.1.Final</version.hibernate-6.3>
-        <version.hibernate-6.4>6.4.2.Final</version.hibernate-6.4>
-        <version.hibernate-6.5>6.5.2.Final</version.hibernate-6.5>
+        <version.hibernate-6.2>6.2.32.Final</version.hibernate-6.2>
+        <version.hibernate-6.4>6.4.10.Final</version.hibernate-6.4>
         <version.hibernate-6.6>6.6.1.Final</version.hibernate-6.6>
+        <version.hibernate-apt>${version.hibernate-6.6}</version.hibernate-apt>
 
-        <version.datanucleus.base-4>4.1.17</version.datanucleus.base-4>
-        <version.datanucleus.rdbms-4>4.1.19</version.datanucleus.rdbms-4>
-        <version.datanucleus.api-jpa-4>4.1.15</version.datanucleus.api-jpa-4>
-        <version.datanucleus.jpa-4>4.0.6</version.datanucleus.jpa-4>
+        <version.eclipselink>4.0.4</version.eclipselink>
 
-        <version.datanucleus.base-5>5.0.9</version.datanucleus.base-5>
-        <version.datanucleus.rdbms-5>5.0.9</version.datanucleus.rdbms-5>
-        <version.datanucleus.api-jpa-5>5.0.13</version.datanucleus.api-jpa-5>
-        <version.datanucleus.jpa-5>5.0.2</version.datanucleus.jpa-5>
+        <version.deltaspike-2.0>2.0.0</version.deltaspike-2.0>
 
-        <version.datanucleus.base-5.1>5.1.6</version.datanucleus.base-5.1>
-        <version.datanucleus.rdbms-5.1>5.1.6</version.datanucleus.rdbms-5.1>
-        <version.datanucleus.api-jpa-5.1>5.1.4</version.datanucleus.api-jpa-5.1>
-        <version.datanucleus.jpa-5.1>5.0.4</version.datanucleus.jpa-5.1>
-
-        <version.eclipselink>2.6.4</version.eclipselink>
-        <version.openjpa>3.1.0</version.openjpa>
-
-        <version.deltaspike-1.7>1.7.2</version.deltaspike-1.7>
-        <version.deltaspike-1.8>1.8.1</version.deltaspike-1.8>
-        <version.deltaspike-1.9>1.9.6</version.deltaspike-1.9>
-
-        <version.spring-data-1.x>1.11.23.RELEASE</version.spring-data-1.x>
-        <version.spring-data-1.x-spring>4.3.9.RELEASE</version.spring-data-1.x-spring>
-        <version.spring-data-1.x-spring-boot>1.5.4.RELEASE</version.spring-data-1.x-spring-boot>
-        <version.spring-data-2.0>2.0.14.RELEASE</version.spring-data-2.0>
-        <version.spring-data-2.0-spring>5.0.4.RELEASE</version.spring-data-2.0-spring>
-        <version.spring-data-2.0-spring-boot>2.0.0.RELEASE</version.spring-data-2.0-spring-boot>
-        <version.spring-data-2.1>2.1.21.RELEASE</version.spring-data-2.1>
-        <version.spring-data-2.1-spring>5.1.8.RELEASE</version.spring-data-2.1-spring>
-        <version.spring-data-2.1-spring-boot>2.1.8.RELEASE</version.spring-data-2.1-spring-boot>
-        <version.spring-data-2.2>2.2.13.RELEASE</version.spring-data-2.2>
-        <version.spring-data-2.2-spring>5.2.2.RELEASE</version.spring-data-2.2-spring>
-        <version.spring-data-2.2-spring-boot>2.2.2.RELEASE</version.spring-data-2.2-spring-boot>
-        <version.spring-data-2.3>2.3.9.RELEASE</version.spring-data-2.3>
-        <version.spring-data-2.3-spring>5.2.6.RELEASE</version.spring-data-2.3-spring>
-        <version.spring-data-2.3-spring-boot>2.3.0.RELEASE</version.spring-data-2.3-spring-boot>
-        <version.spring-data-2.4>2.4.15</version.spring-data-2.4>
-        <version.spring-data-2.4-spring>5.3.15</version.spring-data-2.4-spring>
-        <version.spring-data-2.4-spring-boot>2.4.13</version.spring-data-2.4-spring-boot>
-        <version.spring-data-2.5>2.5.12</version.spring-data-2.5>
-        <version.spring-data-2.5-spring>5.3.27</version.spring-data-2.5-spring>
-        <version.spring-data-2.5-spring-boot>2.5.15</version.spring-data-2.5-spring-boot>
-        <version.spring-data-2.6>2.6.10</version.spring-data-2.6>
-        <version.spring-data-2.6-spring>5.3.27</version.spring-data-2.6-spring>
-        <version.spring-data-2.6-spring-boot>2.6.15</version.spring-data-2.6-spring-boot>
-        <version.spring-data-2.7>2.7.12</version.spring-data-2.7>
-        <version.spring-data-2.7-spring>5.3.27</version.spring-data-2.7-spring>
-        <version.spring-data-2.7-spring-boot>2.7.12</version.spring-data-2.7-spring-boot>
         <version.spring-data-3.1>3.1.12</version.spring-data-3.1>
-        <version.spring-data-3.1-spring>6.0.20</version.spring-data-3.1-spring>
+        <version.spring-data-3.1-spring>6.0.21</version.spring-data-3.1-spring>
         <version.spring-data-3.1-spring-boot>3.1.12</version.spring-data-3.1-spring-boot>
-        <version.spring-data-3.2>3.2.6</version.spring-data-3.2>
-        <version.spring-data-3.2-spring>6.1.8</version.spring-data-3.2-spring>
-        <version.spring-data-3.2-spring-boot>3.2.6</version.spring-data-3.2-spring-boot>
-        <version.spring-data-3.3>3.3.2</version.spring-data-3.3>
-        <version.spring-data-3.3-spring>6.1.8</version.spring-data-3.3-spring>
-        <version.spring-data-3.3-spring-boot>3.3.2</version.spring-data-3.3-spring-boot>
-        <version.openejb>4.7.5</version.openejb>
-        <version.openejb.javaee-api>6.0-6</version.openejb.javaee-api>
-
-        <version.jpa-api>2.2.3</version.jpa-api>
-        <version.jakarta-jpa-api>3.0.0</version.jakarta-jpa-api>
-        <version.jakarta-jpa-3.1-api>3.1.0</version.jakarta-jpa-3.1-api>
-
-        <version.weld>3.1.9.Final</version.weld>
-        <version.quarkus>1.11.7.Final</version.quarkus>
-        <version.quarkus-3>3.2.9.Final</version.quarkus-3>
-        <version.jandex>2.4.2.Final</version.jandex>
+        <version.spring-data-3.2>3.2.10</version.spring-data-3.2>
+        <version.spring-data-3.2-spring>6.1.13</version.spring-data-3.2-spring>
+        <version.spring-data-3.2-spring-boot>3.2.10</version.spring-data-3.2-spring-boot>
+        <version.spring-data-3.3>3.3.5</version.spring-data-3.3>
+        <version.spring-data-3.3-spring>6.1.14</version.spring-data-3.3-spring>
+        <version.spring-data-3.3-spring-boot>3.3.5</version.spring-data-3.3-spring-boot>
+        <version.spring-data-latest>${version.spring-data-3.3}</version.spring-data-latest>
+        <version.spring-data-latest-spring>${version.spring-data-3.3-spring}</version.spring-data-latest-spring>
+        <version.spring-data-latest-spring-boot>${version.spring-data-3.3-spring-boot}</version.spring-data-latest-spring-boot>
+
+        <version.weld>5.1.2.Final</version.weld>
+        <version.quarkus-3>3.2.12.Final</version.quarkus-3>
         <version.classgraph>4.8.89</version.classgraph>
+        <version.jackson>2.15.4</version.jackson>
 
         <asmVersion>9.5</asmVersion>
         <version.bnd>6.4.1</version.bnd>
 <!--        <version.bnd>7.0.0-SNAPSHOT</version.bnd>-->
 
-        <h2.version>1.4.200</h2.version>
-        <h2-2.version>2.2.224</h2-2.version>
+        <h2.version>2.3.232</h2.version>
         <mssql.version>12.4.1.jre8</mssql.version>
 
         <!-- JVM values for surefire plugin -->
-        <!-- Has a default value for Travis; MUST be set to smaller for 32-bit environment -->
-        <surefire.jvm.params>-Xms1024m -Xmx2048m</surefire.jvm.params>
+        <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
 
         <!-- Hibernate user types used for testing -->
         <version.hibernate-types>2.12.1</version.hibernate-types>
@@ -189,238 +130,62 @@
                 <artifactId>blaze-persistence-core-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-api-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-core-parser</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-parser-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-parser-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-core-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-impl-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-api-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-impl-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-entity-view-processor</artifactId>
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
-                <version>${project.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-jpa-criteria-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-api-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-jpa-criteria-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-impl-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-jpa-base</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jpa-base-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jpa-base-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-base</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-base-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate6-base</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-eclipselink</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-openjpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-openjpa-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -429,12 +194,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
+                <artifactId>blaze-persistence-testsuite-base-hibernate6</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -442,51 +202,16 @@
                 <artifactId>blaze-persistence-testsuite-base-eclipselink</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-testsuite-base-jpa-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-testsuite-base-hibernate-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-entity-view-cdi-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-entity-view-cdi-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-base</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-base-3.1</artifactId>
@@ -497,51 +222,6 @@
                 <artifactId>blaze-persistence-integration-spring-data-base-3.3</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
@@ -557,11 +237,6 @@
                 <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-webflux</artifactId>
@@ -572,11 +247,6 @@
                 <artifactId>blaze-persistence-integration-spring-hateoas-webmvc</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-deltaspike-data-api</artifactId>
@@ -589,12 +259,7 @@
             </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+                <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -617,61 +282,31 @@
                 <artifactId>blaze-persistence-integration-jaxrs-jackson</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-jaxrs-jsonb</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jaxrs-jsonb-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-integration-jackson</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-jsonb</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql-spqr</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-graphql-spqr-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
@@ -687,11 +322,6 @@
                 <artifactId>blaze-persistence-integration-spring-hateoas-webmvc</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-quarkus</artifactId>
@@ -707,11 +337,6 @@
                 <artifactId>blaze-persistence-integration-querydsl-expressions</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-integration-querydsl-expressions-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>blaze-persistence-examples-showcase-base</artifactId>
@@ -740,30 +365,126 @@
 
             <!-- Platform dependencies -->
 
-            <dependency>
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>javaee-api</artifactId>
-                <version>${version.openejb.javaee-api}</version>
-                <scope>provided</scope>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.persistence</groupId>
                 <artifactId>jakarta.persistence-api</artifactId>
                 <version>${version.jpa-api}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>jakarta.transaction</groupId>
+                <artifactId>jakarta.transaction-api</artifactId>
+                <version>${version.jta-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.interceptor</groupId>
+                <artifactId>jakarta.interceptor-api</artifactId>
+                <version>${version.interceptor-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>${version.atinject-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                <version>${version.cdi-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.el</groupId>
+                <artifactId>jakarta.el-api</artifactId>
+                <version>${version.el-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${version.jaxrs-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${version.validation-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${version.jaxb-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${version.jaxb}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${version.annotation-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${version.activation-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.json.bind</groupId>
+                <artifactId>jakarta.json.bind-api</artifactId>
+                <version>${version.jsonb-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.json</groupId>
+                <artifactId>jakarta.json-api</artifactId>
+                <version>${version.json-api}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ejb</groupId>
+                <artifactId>jakarta.ejb-api</artifactId>
+                <version>${version.ejb-api}</version>
+                <scope>provided</scope>
+            </dependency>
+
 
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
                 <artifactId>weld-se-core</artifactId>
                 <version>${version.weld}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss</groupId>
-                        <artifactId>jandex</artifactId>
-                    </exclusion>
-                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${version.jackson}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${version.jackson}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${version.jackson}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+                <artifactId>jackson-jakarta-rs-json-provider</artifactId>
+                <version>${version.jackson}</version>
+                <scope>test</scope>
             </dependency>
 
             <!-- Test -->
@@ -773,6 +494,12 @@
                 <version>${version.junit}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${version.junit-jupiter}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
@@ -803,13 +530,12 @@
             </dependency>
 
             <!-- RDBMS driver versions -->
-            <!-- We unfortunately can't list the dependency here, because otherwise the Quarkus SNAPSHOT build would fail -->
-<!--            <dependency>-->
-<!--                <groupId>com.h2database</groupId>-->
-<!--                <artifactId>h2</artifactId>-->
-<!--                <version>${h2.version}</version>-->
-<!--                <scope>test</scope>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${h2.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
@@ -861,11 +587,6 @@
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>${version.antrun.plugin}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.bsc.maven</groupId>
-                    <artifactId>maven-processor-plugin</artifactId>
-                    <version>${version.processor.plugin}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
@@ -991,8 +712,6 @@
                 <configuration>
                     <source>${maven.compiler.argument.source}</source>
                     <target>${maven.compiler.argument.target}</target>
-                    <!-- Disable annotation processing via compiler plugin. -->
-                    <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
             <plugin>
@@ -1032,6 +751,7 @@
                     <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
                     <consoleOutput>true</consoleOutput>
                     <skip>${skipCheckstyle}</skip>
+                    <excludes>**/module-info.java</excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -1065,15 +785,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>post-10-unsafe-code</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 04ea9708de..a425d75046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <artifactId>blaze-persistence</artifactId>
-    <version>1.6.15-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Blazebit Blaze-Persistence</name>
@@ -22,19 +22,19 @@
     <description>Blazebit Blaze-Persistence</description>
 
     <properties>
-        <jdk8.home>${env.JAVA_HOME}</jdk8.home>
         <dbHost>localhost</dbHost>
-        <main.java.version>1.7</main.java.version>
+        <main.java.version>11</main.java.version>
+        <jdk.min.version>17</jdk.min.version>
         <maven.compiler.target>${main.java.version}</maven.compiler.target>
         <maven.compiler.source>${main.java.version}</maven.compiler.source>
-        <version.checkstyle>9.3</version.checkstyle>
+        <version.checkstyle>10.19.0</version.checkstyle>
 
         <!-- Plugin versions -->
         <version.antrun.plugin>3.1.0</version.antrun.plugin>
         <version.assembly.plugin>3.6.0</version.assembly.plugin>
-        <version.checkstyle.plugin>3.3.0</version.checkstyle.plugin>
+        <version.checkstyle.plugin>3.6.0</version.checkstyle.plugin>
         <version.clean.plugin>3.3.1</version.clean.plugin>
-        <version.compiler.plugin>3.11.0</version.compiler.plugin>
+        <version.compiler.plugin>3.13.0</version.compiler.plugin>
         <version.dependency.plugin>3.6.0</version.dependency.plugin>
         <version.deploy.plugin>3.1.1</version.deploy.plugin>
         <version.ear.plugin>3.3.0</version.ear.plugin>
@@ -50,7 +50,6 @@
         <version.javadoc.plugin>3.6.0</version.javadoc.plugin>
         <version.moditect.plugin>1.0.0.RC1</version.moditect.plugin>
         <version.plugin.plugin>3.9.0</version.plugin.plugin>
-        <version.processor.plugin>3.3.2</version.processor.plugin>
         <version.release.plugin>3.0.1</version.release.plugin>
         <version.resources.plugin>3.3.1</version.resources.plugin>
         <version.shade.plugin>3.5.1</version.shade.plugin>
@@ -145,138 +144,6 @@
             </roles>
         </developer>
     </developers>
-    <profiles>
-        <profile>
-            <!-- It disables javadoc doclint for JDK > 8 -->
-            <id>javadoc-xdoclint-disable-jdk8+</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>${version.javadoc.plugin}</version>
-                            <configuration>
-                                <source>8</source> <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-<!--                                <source>${main.java.version}</source>-->
-                                <additionalJOption>-Xdoclint:none</additionalJOption>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        <profile>
-            <id>jdk9+</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-            </activation>
-            <properties>
-                <maven.processor.source>1.9</maven.processor.source>
-                <maven.processor.target>1.9</maven.processor.target>
-            </properties>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>${version.javadoc.plugin}</version>
-                            <configuration>
-                                <source>8</source> <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-                                <additionalJOption>-Xdoclint:none</additionalJOption>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        <profile>
-            <id>jdk20+</id>
-            <activation>
-                <jdk>[20,)</jdk>
-            </activation>
-            <properties>
-                <!-- JDK20 dropped support for compiling to the target version 7 -->
-                <main.java.version>1.8</main.java.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.gmavenplus</groupId>
-                        <artifactId>gmavenplus-plugin</artifactId>
-                        <version>1.9.0</version>
-                        <executions>
-                            <execution>
-                                <id>prepare-escaped-jar-path</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <scripts>
-                                        <script>
-                                            <![CDATA[
-                                                String s = System.getProperty("jdk8.home");
-                                                if (s == null) {
-                                                    s = project.properties['jdk8.home'];
-                                                }
-                                                if (s.endsWith(java.io.File.separator)) {
-                                                    s = s.substring(0, s.length() - 1);
-                                                }
-                                                if (System.getProperty("os.name").startsWith("Windows")) {
-                                                    System.setProperty("jdk8.classes.jar.escaped", (s + java.io.File.separator + "jre" + java.io.File.separator + "lib" + java.io.File.separator + "rt.jar").replaceAll(java.io.File.separator + java.io.File.separator, java.io.File.separator + java.io.File.separator + java.io.File.separator + java.io.File.separator));
-                                                } else if (System.getProperty("os.name").startsWith("Mac")) {
-                                                    System.setProperty("jdk8.classes.jar.escaped", s + java.io.File.separator + "jre" + java.io.File.separator + "lib" + java.io.File.separator + "classes.jar");
-                                                } else {
-                                                    System.setProperty("jdk8.classes.jar.escaped", s + java.io.File.separator + "jre" + java.io.File.separator + "lib" + java.io.File.separator + "rt.jar");
-                                                }
-                                            ]]>
-                                        </script>
-                                    </scripts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-all</artifactId>
-                                <version>3.0.11</version>
-                                <type>pom</type>
-                                <scope>runtime</scope>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>enforce-jdk8-available</id>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                                <configuration>
-                                    <rules>
-                                        <evaluateBeanshell>
-                                            <message>To create a release build of this project with JDK 11+ you need to provide a system property "jdk8.home" that can be used to access the rt.jar or classes.jar on Mac</message>
-                                            <condition>System.getProperty("java.specification.version").contains(".") || Integer.parseInt(System.getProperty("java.specification.version")) &lt; 11 || new java.io.File(System.getProperty("jdk8.classes.jar.escaped")).exists()</condition>
-                                        </evaluateBeanshell>
-                                    </rules>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
     <build>
         <pluginManagement>
@@ -303,6 +170,15 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${version.javadoc.plugin}</version>
+                    <configuration>
+                        <source>8</source> <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+                        <additionalJOption>-Xdoclint:none</additionalJOption>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -349,8 +225,9 @@
                         <exclude>**/src/main/java/com/blazebit/persistence/spring/data/webflux/impl/PageableHandlerMethodArgumentResolver.java</exclude>
                         <exclude>**/src/main/java/com/blazebit/persistence/spring/data/webflux/impl/SortHandlerMethodArgumentResolver.java</exclude>
                         <exclude>**/src/main/java/com/blazebit/persistence/spring/data/webflux/impl/SortArgumentResolver.java</exclude>
-                        <exclude>**/src/main/java/org/springframework/data/jpa/repository/query/FixedJpaQueryCreator.java</exclude>
-                        <exclude>**/src/main/java/org/springframework/data/repository/config/BootstrapMode.java</exclude>
+                        <exclude>**/src/main/java/com/blazebit/persistence/spring/data/base/query/FixedJpaQueryCreator.java</exclude>
+                        <exclude>**/src/main/java/com/blazebit/persistence/spring/data/base/query/QueryUtils.java</exclude>
+                        <exclude>**/src/main/java/com/blazebit/persistence/spring/data/repository/config/BootstrapMode.java</exclude>
                         <exclude>**/src/main/java/com/blazebit/persistence/integration/jsonb/jsonstructure/**</exclude>
 
                         <exclude>**/src/main/java/com/blazebit/persistence/deltaspike/data/impl/meta/RepositoryDefinitionException.java</exclude>
diff --git a/setup-graalvm.sh b/setup-graalvm.sh
index 778a446592..5fbbbcf6e2 100644
--- a/setup-graalvm.sh
+++ b/setup-graalvm.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-GRAALVM_VERSION=20.1.0
+GRAALVM_VERSION=17.0.9
 
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 78BD65473CB3BD13
 sudo apt-get update
 sudo apt-get -y install build-essential libz-dev zlib1g-dev
-curl -LJ "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-java11-linux-amd64-$GRAALVM_VERSION.tar.gz" --output graalvm.tar.gz
+curl -LJ "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAALVM_VERSION}/graalvm-community-jdk-${GRAALVM_VERSION}_linux-x64_bin.tar.gz" --output graalvm.tar.gz
 tar -xzf graalvm.tar.gz
-export GRAALVM_HOME="$PWD/graalvm-ce-java11-$GRAALVM_VERSION"
+export GRAALVM_HOME="$PWD/graalvm-community-openjdk-$GRAALVM_VERSION+9.1"
 ${GRAALVM_HOME}/bin/gu install native-image
\ No newline at end of file
diff --git a/testsuite-base/assertion/pom.xml b/testsuite-base/assertion/pom.xml
index 4d6bb341c3..2ef4627e02 100644
--- a/testsuite-base/assertion/pom.xml
+++ b/testsuite-base/assertion/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AbstractAssertStatement.java b/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AbstractAssertStatement.java
index 5e8b1ed851..ea2e4e75cb 100644
--- a/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AbstractAssertStatement.java
+++ b/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AbstractAssertStatement.java
@@ -204,9 +204,11 @@ public void visit(ParenthesedFromItem fromItem) {
             Delete delete = (Delete) statement;
             if (delete.getTables().size() == 1) {
                 Table t = delete.getTables().get(0);
-                for (Join join : delete.getJoins()) {
-                    if (join.getRightItem().getAlias().getName().equals(t.getName())) {
-                        return Collections.singletonList((Table) join.getRightItem());
+                if (delete.getJoins() != null && !delete.getJoins().isEmpty()) {
+                    for (Join join : delete.getJoins()) {
+                        if (join.getRightItem().getAlias().getName().equals(t.getName())) {
+                            return Collections.singletonList((Table) join.getRightItem());
+                        }
                     }
                 }
                 return Collections.singletonList(t);
diff --git a/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AssertStatementBuilder.java b/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AssertStatementBuilder.java
index 92e6b7bfc8..c1b0365154 100644
--- a/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AssertStatementBuilder.java
+++ b/testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AssertStatementBuilder.java
@@ -172,7 +172,7 @@ public void validate() {
             try {
                 statements.get(i).validate(queries.get(i));
             } catch (Throwable t) {
-                if (t instanceof MultipleFailuresError) {
+                if (t instanceof MultipleFailuresError ) {
                     failures.addAll(((MultipleFailuresError) t).getFailures());
                 } else {
                     failures.add(t);
diff --git a/testsuite-base/assertion/src/main/java/module-info.java b/testsuite-base/assertion/src/main/java/module-info.java
new file mode 100644
index 0000000000..b5306d77c5
--- /dev/null
+++ b/testsuite-base/assertion/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.testsuite.assertion {
+	requires net.sf.jsqlparser;
+	requires junit;
+	requires com.blazebit.persistence.testsuite.base.jpa;
+	requires org.opentest4j;
+	exports com.blazebit.persistence.testsuite.base.jpa.assertion;
+}
\ No newline at end of file
diff --git a/testsuite-base/datanucleus/pom.xml b/testsuite-base/datanucleus/pom.xml
deleted file mode 100644
index 751f4b1619..0000000000
--- a/testsuite-base/datanucleus/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-    <artifactId>blaze-persistence-testsuite-base-datanucleus</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Testsuite Base DataNucleus</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.datanucleus</module.name>
-    </properties>
-    
-    <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-core</artifactId>
-            <version>${version.datanucleus.base-4}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-rdbms</artifactId>
-            <version>${version.datanucleus.base-4}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <!--
-                        NOTE: We also have a MANIFEST.MF statically defined for the use of a Maven reactor without the packaging phase.
-                        Changes to the following section should therefore also be reflected in that file.
-                        -->
-                        <manifestEntries>
-                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                            <Bundle-Name>blaze-persistence-testsuite-base-datanucleus</Bundle-Name>
-                            <Bundle-SymbolicName>com.blazebit.blaze-persistence-testsuite-base-datanucleus</Bundle-SymbolicName>
-                            <Bundle-Version>${project.version}</Bundle-Version>
-                            <Bundle-Vendor>Blazebit</Bundle-Vendor>
-                            <Require-Bundle>org.datanucleus,org.datanucleus.api.jpa</Require-Bundle>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
deleted file mode 100644
index 80d2839267..0000000000
--- a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import com.blazebit.persistence.testsuite.base.jpa.AbstractJpaPersistenceTest;
-import com.blazebit.persistence.testsuite.base.jpa.cleaner.DatabaseCleaner;
-import org.datanucleus.ExecutionContext;
-import org.datanucleus.store.StoreManager;
-import org.datanucleus.store.connection.ConnectionManager;
-import org.datanucleus.store.connection.ManagedConnection;
-import org.junit.Before;
-
-import javax.persistence.EntityManager;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.util.Properties;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public abstract class AbstractPersistenceTest extends AbstractJpaPersistenceTest {
-
-    // We need to recreate the emf because Datanucleus uses messed up metadata otherwise
-    @Before
-    public void recreateEmf() {
-        if (emf != null && emf.isOpen()) {
-            emf.close();
-        }
-        emf = null;
-        em = null;
-        init();
-    }
-
-    @Override
-    protected Properties applyProperties(Properties properties) {
-        properties.put("datanucleus.rdbms.mysql.characterSet", "utf8mb3");
-        properties.put("datanucleus.rdbms.mysql.collation", "utf8mb3_bin");
-
-        String targetSchema = getTargetSchema();
-        if (targetSchema != null && getSchemaMode() == SchemaMode.JPA) {
-            properties.put("datanucleus.mapping.Schema", targetSchema);
-        }
-        return properties;
-    }
-
-    @Override
-    protected boolean supportsMapKeyDeReference() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsInverseSetCorrelationJoinsSubtypesWhenJoined() {
-        return true;
-    }
-
-    @Override
-    protected void addIgnores(DatabaseCleaner applicableCleaner) {
-        applicableCleaner.addIgnoredTable("SEQUENCE_TABLE");
-    }
-
-    @Override
-    protected Connection getConnection(EntityManager em) {
-        StoreManager storeManager = em.unwrap(StoreManager.class);
-        ExecutionContext ec = em.unwrap(ExecutionContext.class);
-        try {
-            // Datanucleus 5.1 changed the API
-            Method getConnection = ConnectionManager.class.getMethod("getConnection", ExecutionContext.class);
-            ConnectionManager connectionManager = storeManager.getConnectionManager();
-            return (Connection) ((ManagedConnection) getConnection.invoke(connectionManager, ec)).getConnection();
-        } catch (NoSuchMethodException ex) {
-            return (Connection) storeManager.getConnection(ec).getConnection();
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    protected JpaProviderFamily getJpaProviderFamily() {
-        return JpaProviderFamily.DATANUCLEUS;
-    }
-
-    @Override
-    protected int getJpaProviderMajorVersion() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected int getJpaProviderMinorVersion() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLAdapter.java b/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLAdapter.java
deleted file mode 100644
index 94fc6bd6e1..0000000000
--- a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLAdapter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.rdbms.schema.JDBCTypeInfo;
-import org.datanucleus.store.rdbms.schema.RDBMSTypesInfo;
-import org.datanucleus.store.rdbms.schema.SQLTypeInfo;
-import org.datanucleus.store.schema.StoreSchemaHandler;
-
-import java.sql.DatabaseMetaData;
-import java.sql.Types;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class SaneMySQLAdapter extends org.datanucleus.store.rdbms.adapter.MySQLAdapter {
-    public SaneMySQLAdapter(DatabaseMetaData metadata) {
-        super(metadata);
-    }
-
-    public void initialiseTypes(StoreSchemaHandler handler, ManagedConnection mconn) {
-        super.initialiseTypes(handler, mconn);
-
-        RDBMSTypesInfo typesInfo = (RDBMSTypesInfo)handler.getSchemaData(mconn.getConnection(), "types", null);
-
-        JDBCTypeInfo jdbcType = (JDBCTypeInfo)typesInfo.getChild(Integer.toString(Types.TIMESTAMP));
-        if (jdbcType != null && jdbcType.getNumberOfChildren() > 0) {
-            SQLTypeInfo dfltTypeInfo = (SQLTypeInfo)jdbcType.getChild("TIMESTAMP");
-            dfltTypeInfo.setTypeName("TIMESTAMP(6)");
-        }
-        jdbcType = (JDBCTypeInfo)typesInfo.getChild(Integer.toString(Types.TIME));
-        if (jdbcType != null && jdbcType.getNumberOfChildren() > 0) {
-            SQLTypeInfo dfltTypeInfo = (SQLTypeInfo)jdbcType.getChild("TIME");
-            dfltTypeInfo.setTypeName("TIME(6)");
-        }
-    }
-}
diff --git a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SanePostgreSQLAdapter.java b/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SanePostgreSQLAdapter.java
deleted file mode 100644
index f53667392b..0000000000
--- a/testsuite-base/datanucleus/src/main/java/com/blazebit/persistence/testsuite/base/SanePostgreSQLAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.rdbms.schema.JDBCTypeInfo;
-import org.datanucleus.store.rdbms.schema.RDBMSTypesInfo;
-import org.datanucleus.store.rdbms.schema.SQLTypeInfo;
-import org.datanucleus.store.schema.StoreSchemaHandler;
-
-import java.sql.DatabaseMetaData;
-import java.sql.Types;
-
-/**
- * @author Christian Beikov
- * @since 1.2.0
- */
-public class SanePostgreSQLAdapter extends org.datanucleus.store.rdbms.adapter.PostgreSQLAdapter {
-    public SanePostgreSQLAdapter(DatabaseMetaData metadata) {
-        super(metadata);
-    }
-
-    public void initialiseTypes(StoreSchemaHandler handler, ManagedConnection mconn) {
-        super.initialiseTypes(handler, mconn);
-
-        RDBMSTypesInfo typesInfo = (RDBMSTypesInfo)handler.getSchemaData(mconn.getConnection(), "types", null);
-
-        // Make use of the normal timestamp type without timezones to have comparable results
-        JDBCTypeInfo jdbcType = (JDBCTypeInfo)typesInfo.getChild(Integer.toString(Types.TIMESTAMP));
-        if (jdbcType != null && jdbcType.getNumberOfChildren() > 0) {
-            SQLTypeInfo dfltTypeInfo = (SQLTypeInfo)jdbcType.getChildren().remove("timestamptz");
-            dfltTypeInfo.setTypeName("timestamp");
-            jdbcType.addChild(dfltTypeInfo);
-        }
-    }
-}
diff --git a/testsuite-base/datanucleus/src/main/resources/META-INF/MANIFEST.MF b/testsuite-base/datanucleus/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index b8a18db700..0000000000
--- a/testsuite-base/datanucleus/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: blaze-persistence-testsuite-base-datanucleus
-Bundle-SymbolicName: com.blazebit.blaze-persistence-testsuite-base-datanucleus
-Bundle-Version: 1.0.0
-Bundle-Vendor: Blazebit
-Require-Bundle: org.datanucleus,org.datanucleus.api.jpa
diff --git a/testsuite-base/datanucleus/src/main/resources/plugin.xml b/testsuite-base/datanucleus/src/main/resources/plugin.xml
deleted file mode 100644
index b324e4842c..0000000000
--- a/testsuite-base/datanucleus/src/main/resources/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-<plugin id="com.blazebit.persistence.testsuite" name="Blaze-Persistence DataNucleus plugin" provider-name="Blazebit">
-    <extension point="org.datanucleus.store.rdbms.datastoreadapter">
-        <datastore-adapter vendor-id="mysql" class-name="com.blazebit.persistence.testsuite.base.SaneMySQLAdapter" priority="10"/>
-        <datastore-adapter vendor-id="postgresql" class-name="com.blazebit.persistence.testsuite.base.SanePostgreSQLAdapter" priority="10"/>
-    </extension>
-</plugin>
\ No newline at end of file
diff --git a/testsuite-base/eclipselink/pom.xml b/testsuite-base/eclipselink/pom.xml
index 3dabaf89eb..2da0dc1f03 100644
--- a/testsuite-base/eclipselink/pom.xml
+++ b/testsuite-base/eclipselink/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,14 +20,14 @@
     <name>Blazebit Persistence Testsuite Base EclipseLink</name>
 
     <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.eclipselink</module.name>
+        <module.name>com.blazebit.persistence.testsuite.base</module.name>
     </properties>
 
     <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
+
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/testsuite-base/eclipselink/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/eclipselink/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
index 6797c3078a..7da7bb6821 100644
--- a/testsuite-base/eclipselink/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ b/testsuite-base/eclipselink/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
@@ -12,9 +12,9 @@
 import org.eclipse.persistence.internal.jpa.EntityManagerSetupImpl;
 import org.eclipse.persistence.sessions.factories.SessionManager;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/testsuite-base/eclipselink/src/main/java/module-info.java b/testsuite-base/eclipselink/src/main/java/module-info.java
new file mode 100644
index 0000000000..26e3efa46d
--- /dev/null
+++ b/testsuite-base/eclipselink/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.testsuite.base {
+	requires java.naming;
+	requires eclipselink;
+	requires com.blazebit.persistence.testsuite.base.jpa;
+	requires com.blazebit.persistence.core;
+	exports com.blazebit.persistence.testsuite.base;
+}
\ No newline at end of file
diff --git a/testsuite-base/hibernate-jakarta/pom.xml b/testsuite-base/hibernate-jakarta/pom.xml
deleted file mode 100644
index 858b73cc20..0000000000
--- a/testsuite-base/hibernate-jakarta/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-testsuite-base-hibernate-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.hibernate</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-testsuite-base-hibernate:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-testsuite-base-hibernate:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-testsuite-base-hibernate:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/testsuite-base/hibernate/pom.xml b/testsuite-base/hibernate/pom.xml
deleted file mode 100644
index df58a1af8c..0000000000
--- a/testsuite-base/hibernate/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-    <artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Testsuite Base Hibernate</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.hibernate</module.name>
-    </properties>
-    
-    <dependencies>        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <!-- Minimum version is 4.2.8.Final -->
-            <!-- 4.2.15.Final has a bug regarding naming strategies -->
-            <version>4.2.14.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
deleted file mode 100644
index 58c9f5d843..0000000000
--- a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import com.blazebit.persistence.spi.JoinTable;
-import com.blazebit.persistence.testsuite.base.jpa.AbstractJpaPersistenceTest;
-import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo;
-import com.blazebit.persistence.testsuite.base.jpa.RelationalModelAccessor;
-import com.blazebit.persistence.testsuite.base.jpa.cleaner.DatabaseCleaner;
-import org.hibernate.Version;
-import org.hibernate.dialect.SQLServer2012Dialect;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.Status;
-import org.hibernate.persister.entity.AbstractEntityPersister;
-
-import javax.persistence.EntityManager;
-import javax.sql.DataSource;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.security.ProtectionDomain;
-import java.sql.Connection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.function.Consumer;
-
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public abstract class AbstractPersistenceTest extends AbstractJpaPersistenceTest {
-
-    private static final int HIBERNATE_MAJOR_VERSION;
-    private static final int HIBERNATE_MINOR_VERSION;
-
-    static {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        HIBERNATE_MAJOR_VERSION = Integer.parseInt(versionParts[0]);
-        HIBERNATE_MINOR_VERSION = Integer.parseInt(versionParts[1]);
-        // This is pretty hackish but necessary to be able to execute tests with Hibernate before 5.2 as well
-        // We have an empty stub interface class org.hibernate.engine.spi.SharedSessionContractImplementor to be able to
-        // define user types that are compatible with all Hibernate versions but must ensure that on 5.2+ we load the correct class
-        // So we find the class file and load that class file into the class loader
-        if (HIBERNATE_MAJOR_VERSION > 5 || HIBERNATE_MINOR_VERSION > 1) {
-            try {
-                URL correctClass = null;
-                ClassLoader classLoader = Version.class.getClassLoader();
-                List<URL> list = Collections.list(classLoader.getResources("org/hibernate/engine/spi/SharedSessionContractImplementor.class"));
-                if (list.size() > 1) {
-                    for (URL url : list) {
-                        if (url.toString().contains(".jar")) {
-                            correctClass = url;
-                        }
-                    }
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    byte[] buffer = new byte[4096];
-                    try (InputStream inputStream = correctClass.openStream()) {
-                        int r;
-                        while ((r = inputStream.read(buffer)) != -1) {
-                            baos.write(buffer, 0, r);
-                        }
-                    }
-                    byte[] bytes = baos.toByteArray();
-                    try {
-                        Method m = MethodHandles.class.getMethod("privateLookupIn", Class.class, MethodHandles.Lookup.class);
-                        // We need a class from the same package
-                        MethodHandles.Lookup lookup = (MethodHandles.Lookup) m.invoke(null, Status.class, MethodHandles.lookup());
-                        MethodHandles.Lookup.class.getMethod("defineClass", byte[].class).invoke(lookup, (Object) bytes);
-                    } catch (NoSuchMethodException ex) {
-                        Field f;
-                        try {
-                            f = Class.forName("sun.misc.Unsafe").getDeclaredField("theUnsafe");
-                            f.setAccessible(true);
-                            Object unsafe = f.get(null);
-                            Method defineClass = Class.forName("sun.misc.Unsafe").getMethod("defineClass", String.class, byte[].class, int.class, int.class, ClassLoader.class, ProtectionDomain.class);
-                            defineClass.invoke(unsafe, "org.hibernate.engine.spi.SharedSessionContractImplementor", bytes, 0, bytes.length, classLoader, null);
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                }
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-
-    @Override
-    protected Connection getConnection(EntityManager em) {
-        return em.unwrap(SessionImplementor.class).connection();
-    }
-
-    @Override
-    protected void addIgnores(DatabaseCleaner applicableCleaner) {
-        applicableCleaner.addIgnoredTable("hibernate_sequence");
-    }
-
-    @Override
-    protected Properties applyProperties(Properties properties) {
-        String jdbcUrl = properties.get("javax.persistence.jdbc.url").toString();
-        if (System.getProperty("hibernate.dialect") != null) {
-            properties.put("hibernate.dialect", System.getProperty("hibernate.dialect"));
-        } else if (jdbcUrl.contains( "mysql" )) {
-            // MySQL is drunk, it does stuff case insensitive by default...
-            properties.put("hibernate.dialect", SaneMySQLDialect.class.getName());
-            
-            // Since MySQL has no sequences, the native strategy is needed for batch inserts
-            if (isHibernate5()) {
-                properties.put("hibernate.id.new_generator_mappings", "false");
-            }
-        } else if ( jdbcUrl.contains( "oracle")) {
-            // The original DB2 dialect maps time types to `date`
-            properties.put("hibernate.dialect", SaneOracleDialect.class.getName());
-        } else if ( jdbcUrl.contains( "db2")) {
-            // The original DB2 dialect misses support for sequence retrieve in select statements
-            properties.put("hibernate.dialect", SaneDB2Dialect.class.getName());
-        } else if ( jdbcUrl.contains( "h2")) {
-            // Hibernate 5 uses sequences by default but h2 seems to have a bug with sequences in a limited query
-            if (isHibernate5()) {
-                properties.put("hibernate.id.new_generator_mappings", "false");
-            }
-        } else if ( jdbcUrl.contains( "sqlserver")) {
-            // Apparently the dialect resolver doesn't choose the latest dialect
-            properties.put("hibernate.dialect", SQLServer2012Dialect.class.getName());
-            // Not sure what is happening, but when the sequence is tried to be fetched, it doesn't exist in SQL Server
-            if (isHibernate5()) {
-                properties.put("hibernate.id.new_generator_mappings", "false");
-            }
-        } else if (isHibernate5() && jdbcUrl.contains( "oracle")) {
-            // Apparently the dialect resolver doesn't choose the latest dialect
-            properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
-        }
-        String targetSchema = System.getProperty("hibernate.default_schema", getTargetSchema());
-        if (targetSchema != null && getSchemaMode() == SchemaMode.JPA) {
-            properties.put("hibernate.default_schema", targetSchema);
-        }
-        if (useHbm2ddl()) {
-            properties.put("hibernate.connection.url", properties.remove("javax.persistence.jdbc.url"));
-            properties.put("hibernate.connection.password", properties.remove("javax.persistence.jdbc.password"));
-            properties.put("hibernate.connection.username", properties.remove("javax.persistence.jdbc.user"));
-            properties.put("hibernate.connection.driver_class", properties.remove("javax.persistence.jdbc.driver"));
-            String dbAction = (String) properties.remove("javax.persistence.schema-generation.database.action");
-            if ("drop-and-create".equals(dbAction)) {
-                properties.put("hibernate.hbm2ddl.auto", "create");
-            } else if ("create".equals(dbAction)) {
-                properties.put("hibernate.hbm2ddl.auto", "create");
-            } else if ("drop".equals(dbAction)) {
-                // That's the best we can do
-                properties.put("hibernate.hbm2ddl.auto", "create-drop");
-            } else if ("none".equals(dbAction)) {
-                properties.put("hibernate.hbm2ddl.auto", "none");
-            } else {
-                throw new IllegalArgumentException("Unsupported database action: " + dbAction);
-            }
-        }
-
-        if (isHibernate526OrOlder()) {
-            // Disable in <= 5.2.6 since it's still broken
-            properties.put("hibernate.collection_join_subquery", "false");
-        }
-
-        // Needed for Envers tests in Hibernate >= 5.3.5, 5.4.x (HHH-12871)
-        properties.put("hibernate.ejb.metamodel.population", "enabled");
-        properties.put("hibernate.jpa.metamodel.population", "enabled");
-
-        if (isHibernate53Or54()) {
-            properties.put("hibernate.archive.scanner", "org.hibernate.boot.archive.scan.internal.DisabledScanner");
-        }
-
-        // Continue using hibernate_sequence also in Hibernate 6 because InsertTest depends on it
-        // If we were to use optimizable sequences, we would require multi-table statements which are unsupported
-        properties.put("hibernate.id.db_structure_naming_strategy", "legacy");
-        // We use the following only for debugging purposes
-        // Normally these settings should be disabled since the output would be too big TravisCI
-//        properties.put("hibernate.show_sql", "true");
-//        properties.put("hibernate.format_sql", "true");
-        return properties;
-    }
-
-    @Override
-    protected void configurePersistenceUnitInfo(MutablePersistenceUnitInfo persistenceUnitInfo) {
-        if (!supportsNestedEmbeddables() && containsDocumentEntity(getEntityClasses())) {
-            persistenceUnitInfo.addMappingFileName("META-INF/override-embeddables-orm.xml");
-        }
-    }
-
-    @Override
-    protected boolean supportsNestedEmbeddables() {
-        return !isHibernate4();
-    }
-
-    @Override
-    public boolean supportsTableGroupJoins() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        int fix = Integer.parseInt(versionParts[2]);
-        return major > 5 || (major == 5 && (minor > 2 || (minor == 2 && fix >= 8)));
-    }
-
-    @Override
-    protected boolean doesJpaMergeOfRecentlyPersistedEntityForceUpdate() {
-        // Not sure when exactly this got fixed, but 5.1 doesn't seem to have that problem
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        int fix = Integer.parseInt(versionParts[2]);
-        return major < 5 || major == 5 && minor < 1 || major == 5 && minor == 1 && fix < 0;
-    }
-
-    @Override
-    protected boolean supportsIndexedInplaceUpdate() {
-        // Hibernate 4 doesn't support inplace updates
-        return isHibernate5();
-    }
-
-    private boolean containsDocumentEntity(Class<?>[] classes) {
-        for (int i = 0; i < classes.length; i++) {
-            if ("Document".equals(classes[i].getSimpleName())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    protected DataSource createDataSource(Map<Object, Object> properties, Consumer<Connection> connectionCustomizer) {
-        if (!useHbm2ddl()) {
-            return super.createDataSource(properties, connectionCustomizer);
-        }
-
-        try {
-            // Load the driver
-            Class.forName((String) properties.remove("hibernate.connection.driver_class"));
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-        return createDataSource(
-                (String) properties.remove("hibernate.connection.url"),
-                (String) properties.remove("hibernate.connection.username"),
-                (String) properties.remove("hibernate.connection.password"),
-                connectionCustomizer
-        );
-    }
-
-    @Override
-    protected RelationalModelAccessor getRelationalModelAccessor() {
-        return new RelationalModelAccessor() {
-            @Override
-            public String tableFromEntity(Class<?> entityClass) {
-                SessionImplementor session = em.unwrap(SessionImplementor.class);
-                AbstractEntityPersister persister = (AbstractEntityPersister) session.getFactory().getEntityPersister(entityClass.getName());
-                return persister.getTableName().substring(persister.getTableName().lastIndexOf('.') + 1);
-            }
-
-            @Override
-            public String tableFromEntityRelation(Class<?> entityClass, String relationName) {
-                JoinTable joinTable = jpaProvider.getJoinTable(em.getMetamodel().entity(entityClass), relationName);
-                if (joinTable != null) {
-                    return joinTable.getTableName().substring(joinTable.getTableName().lastIndexOf('.') + 1);
-                }
-                return null;
-            }
-        };
-    }
-
-    @Override
-    protected boolean supportsMapKeyDeReference() {
-        // Only got introduced in 5.2.8
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        int fix = Integer.parseInt(versionParts[2]);
-        return major > 5 || major == 5 && minor > 2 || major == 5 && minor == 2 && fix > 7;
-    }
-
-    @Override
-    protected boolean supportsInverseSetCorrelationJoinsSubtypesWhenJoined() {
-        // Apparently this got fixed in Hibernate 5
-        return getJpaProviderMajorVersion() >= 5;
-    }
-
-    private boolean isHibernate4() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        return major == 4;
-    }
-
-    private boolean useHbm2ddl() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        return major == 4 && minor <= 3;
-    }
-
-    private boolean isHibernate5() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        return major >= 5;
-    }
-
-    private boolean isHibernate526OrOlder() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        int fix = Integer.parseInt(versionParts[2]);
-        return major < 5 || major == 5 && minor < 2 || major == 5 && minor == 2 && fix < 7;
-    }
-
-    private boolean isHibernate53Or54() {
-        String version = org.hibernate.Version.getVersionString();
-        String[] versionParts = version.split("[\\.-]");
-        int major = Integer.parseInt(versionParts[0]);
-        int minor = Integer.parseInt(versionParts[1]);
-        return major == 5 && (minor == 3 || minor == 4);
-    }
-
-    @Override
-    protected JpaProviderFamily getJpaProviderFamily() {
-        return JpaProviderFamily.HIBERNATE;
-    }
-
-    @Override
-    protected int getJpaProviderMajorVersion() {
-        return HIBERNATE_MAJOR_VERSION;
-    }
-
-    @Override
-    protected int getJpaProviderMinorVersion() {
-        return HIBERNATE_MINOR_VERSION;
-    }
-}
diff --git a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneDB2Dialect.java b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneDB2Dialect.java
deleted file mode 100644
index 55ffb36781..0000000000
--- a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneDB2Dialect.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import org.hibernate.dialect.DB2Dialect;
-
-public class SaneDB2Dialect extends DB2Dialect {
-
-    @Override
-    public String getSelectSequenceNextValString(String sequenceName) {
-        return "next value for " + sequenceName;
-    }
-}
diff --git a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLDialect.java b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLDialect.java
deleted file mode 100644
index d6b499d614..0000000000
--- a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneMySQLDialect.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import org.hibernate.dialect.MySQL5InnoDBDialect;
-
-import java.sql.Types;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class SaneMySQLDialect extends MySQL5InnoDBDialect {
-
-    public SaneMySQLDialect() {
-        registerColumnType( Types.TIME, "time(6)" );
-        registerColumnType( Types.TIMESTAMP, "datetime(6)" );
-    }
-
-    @Override
-    public String getTableTypeString() {
-        return " ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_bin";
-    }
-}
diff --git a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneOracleDialect.java b/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneOracleDialect.java
deleted file mode 100644
index 451b101027..0000000000
--- a/testsuite-base/hibernate/src/main/java/com/blazebit/persistence/testsuite/base/SaneOracleDialect.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import java.sql.Types;
-
-import org.hibernate.dialect.Oracle10gDialect;
-
-/**
- * @author Moritz Becker
- * @since 1.2.0
- */
-public class SaneOracleDialect extends Oracle10gDialect {
-
-    public SaneOracleDialect() {
-        registerColumnType( Types.TIME, "timestamp" );
-    }
-}
diff --git a/testsuite-base/hibernate6/pom.xml b/testsuite-base/hibernate6/pom.xml
index 28f8bd5aa9..f17a570a40 100644
--- a/testsuite-base/hibernate6/pom.xml
+++ b/testsuite-base/hibernate6/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -26,16 +26,15 @@
     <dependencies>        
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <artifactId>blaze-persistence-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa-jakarta</artifactId>
+            <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/testsuite-base/hibernate6/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/hibernate6/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
index 36a9974460..23a68a1efb 100644
--- a/testsuite-base/hibernate6/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ b/testsuite-base/hibernate6/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
@@ -40,7 +40,12 @@ public abstract class AbstractPersistenceTest extends AbstractJpaPersistenceTest
     private static final int HIBERNATE_MINOR_VERSION;
 
     static {
-        String version = org.hibernate.Version.getVersionString();
+        String version;
+        if (org.hibernate.Version.class.getModule().getDescriptor() == null) {
+            version = org.hibernate.Version.getVersionString();
+        } else {
+            version = org.hibernate.Version.class.getModule().getDescriptor().version().get().toString();
+        }
         String[] versionParts = version.split("[\\.-]");
         HIBERNATE_MAJOR_VERSION = Integer.parseInt(versionParts[0]);
         HIBERNATE_MINOR_VERSION = Integer.parseInt(versionParts[1]);
diff --git a/testsuite-base/hibernate6/src/main/java/module-info.java b/testsuite-base/hibernate6/src/main/java/module-info.java
new file mode 100644
index 0000000000..82abe33104
--- /dev/null
+++ b/testsuite-base/hibernate6/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.testsuite.base {
+	requires java.naming;
+	requires org.hibernate.orm.core;
+	requires com.blazebit.persistence.testsuite.base.jpa;
+	requires com.blazebit.persistence.core;
+	exports com.blazebit.persistence.testsuite.base;
+}
\ No newline at end of file
diff --git a/testsuite-base/jpa-jakarta/pom.xml b/testsuite-base/jpa-jakarta/pom.xml
deleted file mode 100644
index 9ff21c76f3..0000000000
--- a/testsuite-base/jpa-jakarta/pom.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>blaze-persistence-testsuite-base-jpa-jakarta</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.jpa</module.name>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-api}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-common-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.ttddyy</groupId>
-            <artifactId>datasource-proxy</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP-java7</artifactId>
-            <version>2.4.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opentest4j</groupId>
-            <artifactId>opentest4j</artifactId>
-            <version>1.0.0-M2</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.github.classgraph</groupId>
-            <artifactId>classgraph</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.core5</groupId>
-            <artifactId>httpcore5</artifactId>
-            <version>5.0.2</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${com.blazebit:blaze-persistence-testsuite-base-jpa:jar}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-sources-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-testsuite-base-jpa:jar}" regexp="\.jar$" replace="-sources.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>transform-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <!--suppress UnresolvedMavenProperty -->
-                                <ac:propertyregex xmlns:ac="antlib:net.sf.antcontrib" property="source" input="${com.blazebit:blaze-persistence-testsuite-base-jpa:jar}" regexp="\.jar$" replace="-javadoc.jar" global="true" />
-                                <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <arg value="${source}" />
-                                    <arg value="${project.build.directory}/${project.build.finalName}-javadoc.jar" />
-                                    <arg value="-q" />
-                                    <arg value="-o" />
-                                    <arg value="-tr" />
-                                    <arg value="${project.basedir}/../../rules/jakarta-renames.properties" />
-                                    <classpath>
-                                        <!--suppress UnresolvedMavenProperty -->
-                                        <pathelement path="${plugin_classpath}" />
-                                    </classpath>
-                                </java>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.transformer</groupId>
-                        <artifactId>org.eclipse.transformer.cli</artifactId>
-                        <version>0.5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bnd.transform</artifactId>
-                        <version>${version.bnd}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                    <classifier>sources</classifier>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>blazebit-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-sources.jar</file>
-                                            <classifier>sources</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.build.finalName}-javadoc.jar</file>
-                                            <classifier>javadoc</classifier>
-                                            <type>jar</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/testsuite-base/jpa/pom.xml b/testsuite-base/jpa/pom.xml
index 17ebc71af6..a48210cba9 100644
--- a/testsuite-base/jpa/pom.xml
+++ b/testsuite-base/jpa/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -21,14 +21,12 @@
 
     <properties>
         <module.name>com.blazebit.persistence.testsuite.base.jpa</module.name>
-        <main.java.version>1.8</main.java.version>
     </properties>
 
     <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
         
@@ -49,7 +47,7 @@
         <dependency>
             <groupId>org.opentest4j</groupId>
             <artifactId>opentest4j</artifactId>
-            <version>1.0.0-M2</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
index 36d466a40b..023b17e159 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/AbstractJpaPersistenceTest.java
@@ -33,17 +33,17 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceProviderResolver;
-import javax.persistence.spi.PersistenceProviderResolverHolder;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceProviderResolver;
+import jakarta.persistence.spi.PersistenceProviderResolverHolder;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -120,8 +120,8 @@ public abstract class AbstractJpaPersistenceTest {
     @BeforeClass
     public static void initLogging() {
         try {
-            LogManager.getLogManager().readConfiguration(AbstractJpaPersistenceTest.class.getResourceAsStream(
-                    "/logging.properties"));
+            LogManager.getLogManager().readConfiguration(Thread.currentThread().getContextClassLoader().getResourceAsStream(
+                    "logging.properties"));
         } catch (Exception e) {
             e.printStackTrace(System.err);
         }
@@ -598,7 +598,7 @@ protected String getTargetDatabase() {
 
     protected Properties createProperties(String dbAction) {
         Properties properties = createDefaultProperties();
-        properties.put("javax.persistence.schema-generation.database.action", dbAction);
+        properties.put("jakarta.persistence.schema-generation.database.action", dbAction);
         String targetDatabase = getTargetDatabase();
         String targetSchema = getTargetSchema();
         if (targetDatabase != null) {
@@ -617,12 +617,12 @@ protected Properties createBootstrapProperties() {
 
     private static Properties createDefaultProperties() {
         Properties properties = new Properties();
-        properties.put("javax.persistence.jdbc.url", System.getProperty("jdbc.url", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"));
-        properties.put("javax.persistence.jdbc.user", System.getProperty("jdbc.user", "user"));
-        properties.put("javax.persistence.jdbc.password", System.getProperty("jdbc.password", "password"));
-        properties.put("javax.persistence.jdbc.driver", System.getProperty("jdbc.driver", "org.h2.Driver"));
-        properties.put("javax.persistence.sharedCache.mode", "NONE");
-        properties.put("javax.persistence.schema-generation.database.action", "none");
+        properties.put("jakarta.persistence.jdbc.url", System.getProperty("jdbc.url", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"));
+        properties.put("jakarta.persistence.jdbc.user", System.getProperty("jdbc.user", "user"));
+        properties.put("jakarta.persistence.jdbc.password", System.getProperty("jdbc.password", "password"));
+        properties.put("jakarta.persistence.jdbc.driver", System.getProperty("jdbc.driver", "org.h2.Driver"));
+        properties.put("jakarta.persistence.sharedCache.mode", "NONE");
+        properties.put("jakarta.persistence.schema-generation.database.action", "none");
         return properties;
     }
 
@@ -683,10 +683,10 @@ protected boolean recreateDataSource() {
     private DataSource getDataSource(Map<Object, Object> properties) {
         if (dataSource != null) {
             // Remove properties that are normally removed
-            properties.remove("javax.persistence.jdbc.driver");
-            properties.remove("javax.persistence.jdbc.url");
-            properties.remove("javax.persistence.jdbc.user");
-            properties.remove("javax.persistence.jdbc.password");
+            properties.remove("jakarta.persistence.jdbc.driver");
+            properties.remove("jakarta.persistence.jdbc.url");
+            properties.remove("jakarta.persistence.jdbc.user");
+            properties.remove("jakarta.persistence.jdbc.password");
 
             properties.remove("hibernate.connection.driver_class");
             properties.remove("hibernate.connection.url");
@@ -708,14 +708,14 @@ private DataSource getBootstrapDataSource() {
     protected DataSource createDataSource(Map<Object, Object> properties, Consumer<Connection> connectionCustomizer) {
         try {
             // Load the driver
-            Class.forName((String) properties.remove("javax.persistence.jdbc.driver"));
+            Class.forName((String) properties.remove("jakarta.persistence.jdbc.driver"));
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
         return createDataSource(
-                (String) properties.remove("javax.persistence.jdbc.url"),
-                (String) properties.remove("javax.persistence.jdbc.user"),
-                (String) properties.remove("javax.persistence.jdbc.password"),
+                (String) properties.remove("jakarta.persistence.jdbc.url"),
+                (String) properties.remove("jakarta.persistence.jdbc.user"),
+                (String) properties.remove("jakarta.persistence.jdbc.password"),
                 connectionCustomizer
         );
     }
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/MutablePersistenceUnitInfo.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/MutablePersistenceUnitInfo.java
index 032833c6b1..5bdf868295 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/MutablePersistenceUnitInfo.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/MutablePersistenceUnitInfo.java
@@ -9,11 +9,11 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.ClassTransformer;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.ClassTransformer;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 
 /**
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/SchemaClearer.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/SchemaClearer.java
index 62d0e9de84..bef9bee9e9 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/SchemaClearer.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/SchemaClearer.java
@@ -45,10 +45,10 @@ private void clearSchema() throws IOException {
                 LOG.warning("Skipping schema clearing because no configuration could be found!");
                 return;
             }
-            properties.put("javax.persistence.jdbc.url", jdbcUrl);
-            properties.put("javax.persistence.jdbc.user", jdbcUser);
-            properties.put("javax.persistence.jdbc.password", jdbcPassword);
-            properties.put("javax.persistence.jdbc.driver", jdbcDriver);
+            properties.put("jakarta.persistence.jdbc.url", jdbcUrl);
+            properties.put("jakarta.persistence.jdbc.user", jdbcUser);
+            properties.put("jakarta.persistence.jdbc.password", jdbcPassword);
+            properties.put("jakarta.persistence.jdbc.driver", jdbcDriver);
         } else {
             Properties p = new Properties();
             try (InputStream stream = Files.newInputStream(configFile)) {
@@ -57,10 +57,10 @@ private void clearSchema() throws IOException {
 
             schema = p.getProperty("quarkus.hibernate-orm.database.default-schema");
 
-            properties.put("javax.persistence.jdbc.url", p.getProperty("quarkus.datasource.url"));
-            properties.put("javax.persistence.jdbc.user", p.getProperty("quarkus.datasource.username"));
-            properties.put("javax.persistence.jdbc.password", p.getProperty("quarkus.datasource.password"));
-            properties.put("javax.persistence.jdbc.driver", p.getProperty("quarkus.datasource.driver"));
+            properties.put("jakarta.persistence.jdbc.url", p.getProperty("quarkus.datasource.url"));
+            properties.put("jakarta.persistence.jdbc.user", p.getProperty("quarkus.datasource.username"));
+            properties.put("jakarta.persistence.jdbc.password", p.getProperty("quarkus.datasource.password"));
+            properties.put("jakarta.persistence.jdbc.driver", p.getProperty("quarkus.datasource.driver"));
         }
         DataSource dataSource = createDataSource(properties, null);
         try (Connection connection = dataSource.getConnection()) {
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java
deleted file mode 100644
index aaa4376d5c..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoDatanucleus {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java
deleted file mode 100644
index c74bd39f99..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoDatanucleus4 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java
deleted file mode 100644
index caee2ed524..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoH2Latest {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java
deleted file mode 100644
index 2cbed949b8..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate43 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java
deleted file mode 100644
index eacd660e86..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate50 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java
deleted file mode 100644
index a767b023a4..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate51 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java
deleted file mode 100644
index f9717f1ef3..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate52 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java
deleted file mode 100644
index 30aee79478..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate53 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java
deleted file mode 100644
index 8387585b76..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoHibernate60 {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java
similarity index 80%
rename from testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java
rename to testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java
index 93cd0cbc76..de87a6f828 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java
@@ -5,6 +5,6 @@
 
 package com.blazebit.persistence.testsuite.base.jpa.category;
 
-public interface NoFirebird {
+public interface NoHibernate62 {
 
 }
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java
similarity index 80%
rename from testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java
rename to testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java
index f287a4e351..a7d39fac76 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java
@@ -5,6 +5,6 @@
 
 package com.blazebit.persistence.testsuite.base.jpa.category;
 
-public interface NoHibernate42 {
+public interface NoHibernate64 {
 
 }
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java
deleted file mode 100644
index 91cc03410a..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoMySQLOld {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java
deleted file mode 100644
index 47d9c97f3a..0000000000
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base.jpa.category;
-
-public interface NoSQLite {
-
-}
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/AbstractMySQLDatabaseCleaner.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/AbstractMySQLDatabaseCleaner.java
index 2fc0d1c644..153e7847c2 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/AbstractMySQLDatabaseCleaner.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/AbstractMySQLDatabaseCleaner.java
@@ -203,7 +203,7 @@ public void createSchemaIfNotExists(Connection connection, String schemaName) {
 
     @Override
     public void applyTargetDatabasePropertyModifications(Map<Object, Object> properties, String databaseName) {
-        String jdbcUrl = (String) properties.get("javax.persistence.jdbc.url");
+        String jdbcUrl = (String) properties.get("jakarta.persistence.jdbc.url");
         try {
             jdbcUrl = "jdbc:" + new URIBuilder(jdbcUrl.substring(jdbcUrl.indexOf(':') + 1))
                     .setPath(databaseName)
@@ -211,7 +211,7 @@ public void applyTargetDatabasePropertyModifications(Map<Object, Object> propert
         } catch (URISyntaxException e) {
             throw new RuntimeException();
         }
-        properties.put("javax.persistence.jdbc.url", jdbcUrl);
+        properties.put("jakarta.persistence.jdbc.url", jdbcUrl);
     }
 
     @Override
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/DB2DatabaseCleaner.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/DB2DatabaseCleaner.java
index 5a45255372..e190086552 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/DB2DatabaseCleaner.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/DB2DatabaseCleaner.java
@@ -410,10 +410,10 @@ public void applyTargetDatabasePropertyModifications(Map<Object, Object> propert
 
     @Override
     public void applyTargetSchemaPropertyModifications(Map<Object, Object> properties, String schemaName) {
-        String jdbcUrl = (String) properties.get("javax.persistence.jdbc.url");
+        String jdbcUrl = (String) properties.get("jakarta.persistence.jdbc.url");
         if (!jdbcUrl.endsWith(";")) {
             jdbcUrl = jdbcUrl + ":";
         }
-        properties.put("javax.persistence.jdbc.url", jdbcUrl + "currentSchema=" + schemaName.toUpperCase() + ";");
+        properties.put("jakarta.persistence.jdbc.url", jdbcUrl + "currentSchema=" + schemaName.toUpperCase() + ";");
     }
 }
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/MSSQLDatabaseCleaner.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/MSSQLDatabaseCleaner.java
index 36d995bee3..9b6ec13bbd 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/MSSQLDatabaseCleaner.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/MSSQLDatabaseCleaner.java
@@ -270,8 +270,8 @@ public void createSchemaIfNotExists(Connection connection, String schemaName) {
 
     @Override
     public void applyTargetDatabasePropertyModifications(Map<Object, Object> properties, String databaseName) {
-        String jdbcUrl = properties.get("javax.persistence.jdbc.url") + ";databaseName=" + databaseName;
-        properties.put("javax.persistence.jdbc.url", jdbcUrl);
+        String jdbcUrl = properties.get("jakarta.persistence.jdbc.url") + ";databaseName=" + databaseName;
+        properties.put("jakarta.persistence.jdbc.url", jdbcUrl);
     }
 
     @Override
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/OracleDatabaseCleaner.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/OracleDatabaseCleaner.java
index c923468710..92bf48df3a 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/OracleDatabaseCleaner.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/OracleDatabaseCleaner.java
@@ -295,7 +295,7 @@ public void applyTargetDatabasePropertyModifications(Map<Object, Object> propert
 
     @Override
     public void applyTargetSchemaPropertyModifications(Map<Object, Object> properties, String schemaName) {
-        properties.put("javax.persistence.jdbc.user", schemaName);
-        properties.put("javax.persistence.jdbc.password", schemaName);
+        properties.put("jakarta.persistence.jdbc.user", schemaName);
+        properties.put("jakarta.persistence.jdbc.password", schemaName);
     }
 }
diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/PostgreSQLDatabaseCleaner.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/PostgreSQLDatabaseCleaner.java
index 23c2df678e..5927edc5df 100644
--- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/PostgreSQLDatabaseCleaner.java
+++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/cleaner/PostgreSQLDatabaseCleaner.java
@@ -223,7 +223,7 @@ public void createSchemaIfNotExists(Connection connection, String schemaName) {
 
     @Override
     public void applyTargetDatabasePropertyModifications(Map<Object, Object> properties, String databaseName) {
-        String jdbcUrl = (String) properties.get("javax.persistence.jdbc.url");
+        String jdbcUrl = (String) properties.get("jakarta.persistence.jdbc.url");
         try {
             jdbcUrl = "jdbc:" + new URIBuilder(jdbcUrl.substring(jdbcUrl.indexOf(':') + 1))
                     .setPath(databaseName)
@@ -231,12 +231,12 @@ public void applyTargetDatabasePropertyModifications(Map<Object, Object> propert
         } catch (URISyntaxException e) {
             throw new RuntimeException();
         }
-        properties.put("javax.persistence.jdbc.url", jdbcUrl);
+        properties.put("jakarta.persistence.jdbc.url", jdbcUrl);
     }
 
     @Override
     public void applyTargetSchemaPropertyModifications(Map<Object, Object> properties, String schemaName) {
-        String jdbcUrl = (String) properties.get("javax.persistence.jdbc.url");
+        String jdbcUrl = (String) properties.get("jakarta.persistence.jdbc.url");
         try {
             jdbcUrl = "jdbc:" + new URIBuilder(jdbcUrl.substring(jdbcUrl.indexOf(':') + 1))
                     .addParameter("currentSchema", schemaName)
@@ -244,6 +244,6 @@ public void applyTargetSchemaPropertyModifications(Map<Object, Object> propertie
         } catch (URISyntaxException e) {
             throw new RuntimeException();
         }
-        properties.put("javax.persistence.jdbc.url", jdbcUrl);
+        properties.put("jakarta.persistence.jdbc.url", jdbcUrl);
     }
 }
diff --git a/testsuite-base/jpa/src/main/java/module-info.java b/testsuite-base/jpa/src/main/java/module-info.java
new file mode 100644
index 0000000000..d4de8475cb
--- /dev/null
+++ b/testsuite-base/jpa/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+module com.blazebit.persistence.testsuite.base.jpa {
+	requires com.blazebit.persistence.core.impl;
+	requires com.blazebit.persistence.core;
+	requires HikariCP.java7;
+	requires datasource.proxy;
+	requires junit;
+	requires jakarta.persistence;
+	requires io.github.classgraph;
+	requires org.apache.httpcomponents.core5.httpcore5;
+	exports com.blazebit.persistence.testsuite.base.jpa;
+	exports com.blazebit.persistence.testsuite.base.jpa.category;
+	exports com.blazebit.persistence.testsuite.base.jpa.cleaner;
+}
\ No newline at end of file
diff --git a/testsuite-base/openjpa/pom.xml b/testsuite-base/openjpa/pom.xml
deleted file mode 100644
index b8f7ba0ddd..0000000000
--- a/testsuite-base/openjpa/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  Copyright Blazebit
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>com.blazebit</groupId>
-        <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-    <artifactId>blaze-persistence-testsuite-base-openjpa</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Blazebit Persistence Testsuite Base OpenJPA</name>
-
-    <properties>
-        <module.name>com.blazebit.persistence.testsuite.base.openjpa</module.name>
-    </properties>
-    
-    <dependencies>
-        <!-- Actually we only need JPA but since there is no official artifact we rather use this than provider specific apis -->
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-testsuite-base-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-openjpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/testsuite-base/openjpa/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java b/testsuite-base/openjpa/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
deleted file mode 100644
index 47e3e51060..0000000000
--- a/testsuite-base/openjpa/src/main/java/com/blazebit/persistence/testsuite/base/AbstractPersistenceTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Blazebit
- */
-
-package com.blazebit.persistence.testsuite.base;
-
-import com.blazebit.persistence.testsuite.base.jpa.AbstractJpaPersistenceTest;
-
-import java.util.Properties;
-
-/**
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public abstract class AbstractPersistenceTest extends AbstractJpaPersistenceTest {
-
-    @Override
-    protected Properties applyProperties(Properties properties) {
-        properties.put("openjpa.RuntimeUnenhancedClasses", "supported");
-        properties.put("openjpa.jdbc.SchemaFactory", "native(foreignKeys=true)");
-        properties.put("openjpa.Sequence", "native");
-        properties.put("openjpa.Log", "DefaultLevel=WARN, Tool=INFO, SQL=TRACE");
-        properties.put("openjpa.jdbc.MappingDefaults", "ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict");
-        String dbAction = (String) properties.remove("javax.persistence.schema-generation.database.action");
-        if ("drop-and-create".equals(dbAction)) {
-            properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(foreignKeys=true,schemaAction='dropDB,add')");
-        } else if ("create".equals(dbAction)) {
-            properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(foreignKeys=true,schemaAction='add')");
-        } else if ("drop".equals(dbAction)) {
-            properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(foreignKeys=true,schemaAction='dropDB')");
-        } else if (!"none".equals(dbAction)) {
-            throw new IllegalArgumentException("Unsupported database action: " + dbAction);
-        }
-        return properties;
-    }
-
-    @Override
-    protected boolean needsEntityManagerForDbAction() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsMapKeyDeReference() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsInverseSetCorrelationJoinsSubtypesWhenJoined() {
-        return true;
-    }
-
-    @Override
-    protected JpaProviderFamily getJpaProviderFamily() {
-        return JpaProviderFamily.OPENJPA;
-    }
-
-    @Override
-    protected int getJpaProviderMajorVersion() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected int getJpaProviderMinorVersion() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/testsuite-base/pom.xml b/testsuite-base/pom.xml
index d9b9a95d5a..84e15708c4 100644
--- a/testsuite-base/pom.xml
+++ b/testsuite-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -22,33 +22,7 @@
         <module>assertion</module>
 
         <module>jpa</module>
-        <module>hibernate</module>
-        <module>datanucleus</module>
+        <module>hibernate6</module>
         <module>eclipselink</module>
-        <module>openjpa</module>
-
-        <module>jpa-jakarta</module>
-        <module>hibernate-jakarta</module>
     </modules>
-
-    <!-- Hibernate 6 is compiled with JDK 11, so we can only compile it, if we the build is running on a JDK 11 -->
-    <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <modules>
-                <module>jpa</module>
-                <module>hibernate</module>
-                <module>datanucleus</module>
-                <module>eclipselink</module>
-                <module>openjpa</module>
-
-                <module>jpa-jakarta</module>
-                <module>hibernate-jakarta</module>
-                <module>hibernate6</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/website/pom.xml b/website/pom.xml
index 48b72bc1d4..ff761cbef8 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.15-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -22,9 +22,9 @@
     <properties>
         <!-- The current stable version -->
         <stable.version>1.6.14</stable.version>
-        <series.version>1.6</series.version>
+        <series.version>2.0</series.version>
         <!-- The current snapshot version -->
-        <snapshot.version>1.6.15-SNAPSHOT</snapshot.version>
+        <snapshot.version>2.0.0-SNAPSHOT</snapshot.version>
 
         <!-- This is used for the htaccess file for filename based caching -->
         <maven.build.timestamp.format>yyyyMMddHHmmssSSSS</maven.build.timestamp.format>
@@ -183,12 +183,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk9+</id>
-            <activation>
-                <jdk>[1.9,)</jdk>
-            </activation>
-        </profile>
     </profiles>
 
     <build>
diff --git a/website/src/main/jbake/content/documentation.adoc b/website/src/main/jbake/content/documentation.adoc
index 32ae94345d..03cdc14c42 100644
--- a/website/src/main/jbake/content/documentation.adoc
+++ b/website/src/main/jbake/content/documentation.adoc
@@ -23,7 +23,7 @@ link:documentation/core/manual/en_US/index.html[Core Reference, window="_blank"]
 The reference documentation for the Core module
 +
 [.versions]
-//link:documentation/1.7/core/manual/en_US/index.html[Development 1.7, window="_blank", role="development-version"]
+link:documentation/2.0/core/manual/en_US/index.html[Development 2.0, window="_blank", role="development-version"]
 link:documentation/1.6/core/manual/en_US/index.html[Latest stable 1.6, window="_blank", role="stable-version"]
 Older
 link:documentation/1.5/core/manual/en_US/index.html[1.5, window="_blank"],
@@ -35,7 +35,7 @@ link:documentation/entity-view/manual/en_US/index.html[Entity View Reference, wi
 The reference documentation for the Entity View module
 +
 [.versions]
-//link:documentation/1.7/entity-view/manual/en_US/index.html[Development 1.7, window="_blank", role="development-version"]
+link:documentation/2.0/entity-view/manual/en_US/index.html[Development 2.0, window="_blank", role="development-version"]
 link:documentation/1.6/entity-view/manual/en_US/index.html[Latest stable 1.6, window="_blank", role="stable-version"]
 Older
 link:documentation/1.5/entity-view/manual/en_US/index.html[1.5, window="_blank"],
diff --git a/website/src/main/jbake/content/downloads.adoc b/website/src/main/jbake/content/downloads.adoc
index 82a8a4048d..8020d488e9 100644
--- a/website/src/main/jbake/content/downloads.adoc
+++ b/website/src/main/jbake/content/downloads.adoc
@@ -45,20 +45,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
-<!-- If you use Jakarta APIs -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-core-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
 <!-- optional -->
 
 <!-- Entity View module -->
@@ -75,20 +61,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
-<!-- Entity View Jakarta module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
 <!-- Entity View CDI integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -96,20 +68,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
-<!-- Entity View CDI Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-entity-view-cdi-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Entity View Spring integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
 
 <!-- Entity View Spring 6+ integration module -->
 <dependency>
@@ -126,92 +84,28 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>compile</scope>
 </dependency>
 
-<!-- DeltaSpike Data 1.8+ integration module -->
+<!-- DeltaSpike Data 2.0 integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.8</artifactId>
+    <artifactId>blaze-persistence-integration-deltaspike-data-impl-2.0</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>runtime</scope>
 </dependency>
 
-<!-- DeltaSpike Data 1.7 integration module -->
+<!-- Spring Data 3.3+ integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-deltaspike-data-impl-1.7</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
     <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
 </dependency>
 
-<!-- Spring Data 3.1 integration module -->
+<!-- Spring Data 3.1+ integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
     <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Spring Data 2.7 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.6 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.5 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.4 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.3 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.3</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.2 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.2</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.1 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.1</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 2.0 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.0</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
-<!-- Spring Data 1.x integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Spring Data WebMvc integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -219,13 +113,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Spring Data WebMvc Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-webmvc-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Spring Data WebFlux integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -240,13 +127,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Spring HATEOAS WebMvc Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-hateoas-webmvc-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- JAX-RS integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -265,18 +145,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <artifactId>blaze-persistence-integration-jaxrs-jsonb</artifactId>
     <version>${blaze-persistence.version}</version>
 </dependency>
-<!-- Use this if you want to use Jackson for JSON serialization/deserialization with Jakarta REST -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jaxrs-jackson-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-<!-- Use this if you want to use JSONB for JSON serialization/deserialization with Jakarta REST -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jaxrs-jsonb-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
 
 <!-- GraphQL integration module -->
 <dependency>
@@ -285,13 +153,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- GraphQL Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-graphql-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Netflix DGS 7+ integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -299,13 +160,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Netflix DGS integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-graphql-dgs</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- SPQR integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -313,13 +167,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- SPQR Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-graphql-spqr-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Jackson integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -327,13 +174,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Jackson Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jackson-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- JSONB integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -341,13 +181,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- JSONB Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-jsonb-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Quarkus 3 integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -355,13 +188,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Quarkus integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-quarkus</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 <!-- Querydsl integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -369,13 +195,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <version>${blaze-persistence.version}</version>
 </dependency>
 
-<!-- Querydsl Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-querydsl-expressions-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-</dependency>
-
 
 <!-- Hibernate 6.2+ integration module -->
 <dependency>
@@ -385,102 +204,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
-<!-- Hibernate 5.6 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.6 Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.5 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.5</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.5 Jakarta integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.5-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.4 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.3 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5.2 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.2</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 5+ integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 4.3 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-4.3</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Hibernate 4.2 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-4.2</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Datanucleus integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-datanucleus</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Datanucleus 5.1 integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-datanucleus-5.1</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
 <!-- EclipseLink integration module -->
 <dependency>
     <groupId>com.blazebit</groupId>
@@ -489,14 +212,6 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
-<!-- OpenJPA integration module -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-openjpa</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
 
 <!-- Blaze-Persistence JPA-Criteria module dependencies -->
 <dependency>
@@ -512,26 +227,4 @@ Older releases can be found on https://github.com/Blazebit/blaze-persistence/rel
     <scope>runtime</scope>
 </dependency>
 
-<!-- Blaze-Persistence JPA-Criteria module dependencies -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-api-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>compile</scope>
-</dependency>
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-impl-jakarta</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
-<!-- Blaze-Persistence JPA-Criteria JPA 2.0 provider support dependencies -->
-<dependency>
-    <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-jpa-criteria-jpa-2-compatibility</artifactId>
-    <version>${blaze-persistence.version}</version>
-    <scope>runtime</scope>
-</dependency>
-
 ----
\ No newline at end of file